[529484] Regenerate without clearResourceSet

40 files changed, 1960 insertions, 2136 deletions

diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java
index 4d85f39ab..a78fe73c8 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/QVTbaseTables.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
  * <copyright>
- * 
- * Copyright (c) 2013, 2017 Willink Transformations and others.
+ *
+ * Copyright (c) 2013, 2018 Willink Transformations 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:
  *   E.D.Willink - Initial API and implementation
- * 
+ *
  * </copyright>
  *************************************************************************
  * This code is 100% auto-generated
@@ -47,7 +47,6 @@ import org.eclipse.qvtd.pivot.qvtbase.QVTbaseTables;
  * In order to ensure correct static initialization, a top level class element must be accessed
  * before any nested class element. Therefore an access to PACKAGE.getClass() is recommended.
  */
-@SuppressWarnings("nls")
 public class QVTbaseTables
 {
 	static {
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java
index 508cc2a10..1296c1105 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/impl/QVTbasePackageImpl.java
@@ -160,13 +160,12 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage {
 
 		// Register package validator
 		EValidator.Registry.INSTANCE.put
-		(theQVTbasePackage,
-			new EValidator.Descriptor() {
-			@Override
-			public EValidator getEValidator() {
-				return QVTbaseValidator.INSTANCE;
-			}
-		});
+			(theQVTbasePackage,
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return QVTbaseValidator.INSTANCE;
+				 }
+			 });
 
 		// Mark meta-data to indicate it can't be changed
 		theQVTbasePackage.freeze();
@@ -940,10 +939,10 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage {
 	protected void createEcoreAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore";
 		addAnnotation
-		(this,
-			source,
-			new String[] {
-		});
+		  (this,
+		   source,
+		   new String[] {
+		   });
 	}
 
 	/**
@@ -955,23 +954,23 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage {
 	protected void createEmofAnnotations() {
 		String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
 		addAnnotation
-		(getPredicate_ConditionExpression(),
-			source,
-			new String[] {
-				"body", "predicate"
-		});
+		  (getPredicate_ConditionExpression(),
+		   source,
+		   new String[] {
+			   "body", "predicate"
+		   });
 		addAnnotation
-		(getTransformation_Extends(),
-			source,
-			new String[] {
-				"body", "extendedBy"
-		});
+		  (getTransformation_Extends(),
+		   source,
+		   new String[] {
+			   "body", "extendedBy"
+		   });
 		addAnnotation
-		(getTypedModel_DependsOn(),
-			source,
-			new String[] {
-				"body", "dependent"
-		});
+		  (getTypedModel_DependsOn(),
+		   source,
+		   new String[] {
+			   "body", "dependent"
+		   });
 	}
 
 	/**
@@ -983,77 +982,77 @@ public class QVTbasePackageImpl extends EPackageImpl implements QVTbasePackage {
 	protected void createUMLAnnotations() {
 		String source = "http://www.eclipse.org/uml2/2.0.0/UML";
 		addAnnotation
-		(getDomain__ValidateNameIsTypedModelName__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NameIsTypedModelName"
-		});
+		  (getDomain__ValidateNameIsTypedModelName__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NameIsTypedModelName"
+		   });
 		addAnnotation
-		(getDomain__ValidateTypedModelIsTransformationModelParameter__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "TypedModelIsTransformationModelParameter"
-		});
+		  (getDomain__ValidateTypedModelIsTransformationModelParameter__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "TypedModelIsTransformationModelParameter"
+		   });
 		addAnnotation
-		(getFunction__ValidateParametersAreFunctionParameter__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "ParametersAreFunctionParameter"
-		});
+		  (getFunction__ValidateParametersAreFunctionParameter__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "ParametersAreFunctionParameter"
+		   });
 		addAnnotation
-		(getFunction__ValidateReturnTypeIsQueryType__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "ReturnTypeIsQueryType"
-		});
+		  (getFunction__ValidateReturnTypeIsQueryType__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "ReturnTypeIsQueryType"
+		   });
 		addAnnotation
-		(getPredicate__ValidateConditionIsBoolean__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "ConditionIsBoolean"
-		});
+		  (getPredicate__ValidateConditionIsBoolean__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "ConditionIsBoolean"
+		   });
 		addAnnotation
-		(getRule__ValidateDomainNameIsUnique__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "DomainNameIsUnique"
-		});
+		  (getRule__ValidateDomainNameIsUnique__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "DomainNameIsUnique"
+		   });
 		addAnnotation
-		(getRule__ValidateNoOverridesCycle__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NoOverridesCycle"
-		});
+		  (getRule__ValidateNoOverridesCycle__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NoOverridesCycle"
+		   });
 		addAnnotation
-		(getRule__ValidateOverridingRuleOverridesAllDomains__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "OverridingRuleOverridesAllDomains"
-		});
+		  (getRule__ValidateOverridingRuleOverridesAllDomains__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "OverridingRuleOverridesAllDomains"
+		   });
 		addAnnotation
-		(getTransformation__ValidateContextTypeIsTransformation__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "ContextTypeIsTransformation"
-		});
+		  (getTransformation__ValidateContextTypeIsTransformation__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "ContextTypeIsTransformation"
+		   });
 		addAnnotation
-		(getTransformation__ValidateExtendedTypedModelIsExtended__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "ExtendedTypedModelIsExtended"
-		});
+		  (getTransformation__ValidateExtendedTypedModelIsExtended__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "ExtendedTypedModelIsExtended"
+		   });
 		addAnnotation
-		(getTransformation__ValidateModelParameterIsUnique__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "ModelParameterIsUnique"
-		});
+		  (getTransformation__ValidateModelParameterIsUnique__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "ModelParameterIsUnique"
+		   });
 		addAnnotation
-		(getTransformation__ValidateNoExtendsCycle__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NoExtendsCycle"
-		});
+		  (getTransformation__ValidateNoExtendsCycle__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NoExtendsCycle"
+		   });
 	}
 
 } //QVTbasePackageImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/AbstractQVTbaseAS2XMIidVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/AbstractQVTbaseAS2XMIidVisitor.java
index b2fa95888..56c8615be 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/AbstractQVTbaseAS2XMIidVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/AbstractQVTbaseAS2XMIidVisitor.java
@@ -30,10 +30,9 @@ import org.eclipse.ocl.pivot.utilities.PivotAS2XMIidVisitor;
  * until a non-interface super-class is found). In the absence of any
  * suitable first super class, the method delegates to visiting().
  */
-@SuppressWarnings("deprecation")
 public abstract class AbstractQVTbaseAS2XMIidVisitor
-extends PivotAS2XMIidVisitor
-implements QVTbaseVisitor<Boolean>
+	extends PivotAS2XMIidVisitor
+	implements QVTbaseVisitor<Boolean>
 {
 	/**
 	 * Initializes me with an initial value for my result.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseAdapterFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseAdapterFactory.java
index 0ea8c3122..92577c2b9 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseAdapterFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/emf-gen/org/eclipse/qvtd/pivot/qvtbase/util/QVTbaseAdapterFactory.java
@@ -96,107 +96,107 @@ public class QVTbaseAdapterFactory extends AdapterFactoryImpl {
 	 */
 	protected QVTbaseSwitch<@Nullable Adapter> modelSwitch =
 			new QVTbaseSwitch<@Nullable Adapter>() {
-		@Override
-		public Adapter caseBaseModel(BaseModel object) {
-			return createBaseModelAdapter();
-		}
-		@Override
-		public Adapter caseDomain(Domain object) {
-			return createDomainAdapter();
-		}
-		@Override
-		public Adapter caseFunction(Function object) {
-			return createFunctionAdapter();
-		}
-		@Override
-		public Adapter caseFunctionParameter(FunctionParameter object) {
-			return createFunctionParameterAdapter();
-		}
-		@Override
-		public Adapter casePattern(Pattern object) {
-			return createPatternAdapter();
-		}
-		@Override
-		public Adapter casePredicate(Predicate object) {
-			return createPredicateAdapter();
-		}
-		@Override
-		public Adapter caseRule(Rule object) {
-			return createRuleAdapter();
-		}
-		@Override
-		public Adapter caseTransformation(Transformation object) {
-			return createTransformationAdapter();
-		}
-		@Override
-		public Adapter caseTypedModel(TypedModel object) {
-			return createTypedModelAdapter();
-		}
-		@Override
-		public Adapter caseVisitable(Visitable object) {
-			return createVisitableAdapter();
-		}
-		@Override
-		public Adapter caseElement(Element object) {
-			return createElementAdapter();
-		}
-		@Override
-		public Adapter caseNameable(Nameable object) {
-			return createNameableAdapter();
-		}
-		@Override
-		public Adapter caseNamedElement(NamedElement object) {
-			return createNamedElementAdapter();
-		}
-		@Override
-		public Adapter caseNamespace(Namespace object) {
-			return createNamespaceAdapter();
-		}
-		@Override
-		public Adapter caseModel(Model object) {
-			return createModelAdapter();
-		}
-		@Override
-		public Adapter caseReferringElement(ReferringElement object) {
-			return createReferringElementAdapter();
-		}
-		@Override
-		public Adapter caseTypedElement(TypedElement object) {
-			return createTypedElementAdapter();
-		}
-		@Override
-		public Adapter caseFeature(Feature object) {
-			return createFeatureAdapter();
-		}
-		@Override
-		public Adapter caseTemplateableElement(TemplateableElement object) {
-			return createTemplateableElementAdapter();
-		}
-		@Override
-		public Adapter caseOperation(Operation object) {
-			return createOperationAdapter();
-		}
-		@Override
-		public Adapter caseVariableDeclaration(VariableDeclaration object) {
-			return createVariableDeclarationAdapter();
-		}
-		@Override
-		public Adapter caseParameter(Parameter object) {
-			return createParameterAdapter();
-		}
-		@Override
-		public Adapter caseType(Type object) {
-			return createTypeAdapter();
-		}
-		@Override
-		public Adapter caseClass(org.eclipse.ocl.pivot.Class object) {
-			return createClassAdapter();
-		}
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
+			@Override
+			public Adapter caseBaseModel(BaseModel object) {
+				return createBaseModelAdapter();
+			}
+			@Override
+			public Adapter caseDomain(Domain object) {
+				return createDomainAdapter();
+			}
+			@Override
+			public Adapter caseFunction(Function object) {
+				return createFunctionAdapter();
+			}
+			@Override
+			public Adapter caseFunctionParameter(FunctionParameter object) {
+				return createFunctionParameterAdapter();
+			}
+			@Override
+			public Adapter casePattern(Pattern object) {
+				return createPatternAdapter();
+			}
+			@Override
+			public Adapter casePredicate(Predicate object) {
+				return createPredicateAdapter();
+			}
+			@Override
+			public Adapter caseRule(Rule object) {
+				return createRuleAdapter();
+			}
+			@Override
+			public Adapter caseTransformation(Transformation object) {
+				return createTransformationAdapter();
+			}
+			@Override
+			public Adapter caseTypedModel(TypedModel object) {
+				return createTypedModelAdapter();
+			}
+			@Override
+			public Adapter caseVisitable(Visitable object) {
+				return createVisitableAdapter();
+			}
+			@Override
+			public Adapter caseElement(Element object) {
+				return createElementAdapter();
+			}
+			@Override
+			public Adapter caseNameable(Nameable object) {
+				return createNameableAdapter();
+			}
+			@Override
+			public Adapter caseNamedElement(NamedElement object) {
+				return createNamedElementAdapter();
+			}
+			@Override
+			public Adapter caseNamespace(Namespace object) {
+				return createNamespaceAdapter();
+			}
+			@Override
+			public Adapter caseModel(Model object) {
+				return createModelAdapter();
+			}
+			@Override
+			public Adapter caseReferringElement(ReferringElement object) {
+				return createReferringElementAdapter();
+			}
+			@Override
+			public Adapter caseTypedElement(TypedElement object) {
+				return createTypedElementAdapter();
+			}
+			@Override
+			public Adapter caseFeature(Feature object) {
+				return createFeatureAdapter();
+			}
+			@Override
+			public Adapter caseTemplateableElement(TemplateableElement object) {
+				return createTemplateableElementAdapter();
+			}
+			@Override
+			public Adapter caseOperation(Operation object) {
+				return createOperationAdapter();
+			}
+			@Override
+			public Adapter caseVariableDeclaration(VariableDeclaration object) {
+				return createVariableDeclarationAdapter();
+			}
+			@Override
+			public Adapter caseParameter(Parameter object) {
+				return createParameterAdapter();
+			}
+			@Override
+			public Adapter caseType(Type object) {
+				return createTypeAdapter();
+			}
+			@Override
+			public Adapter caseClass(org.eclipse.ocl.pivot.Class object) {
+				return createClassAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore
index 2ca27ea3f..3128662ff 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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" xmi:id="P-qvtbase" name="qvtbase" nsURI="http://www.eclipse.org/qvt/2015/QVTbase"
-    nsPrefix="qvtb">
+<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"
+    xmi:id="P-qvtbase" name="qvtbase" nsURI="http://www.eclipse.org/qvt/2015/QVTbase" nsPrefix="qvtb">
   <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
     <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
     <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
     <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
   </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-BaseModel" name="BaseModel"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Model"/>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Domain" name="Domain" abstract="true"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-NamedElement ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ReferringElement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-BaseModel" name="BaseModel" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Model"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Domain" name="Domain" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-NamedElement ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ReferringElement">
     <eOperations name="validateNameIsTypedModelName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="NameIsTypedModelName"/>
@@ -41,19 +38,15 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtbase-Domain-isCheckable"
-        name="isCheckable" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtbase-Domain-isCheckable" name="isCheckable" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtbase-Domain-isEnforceable"
-        name="isEnforceable" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtbase-Domain-isEnforceable" name="isEnforceable" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Domain-rule"
-        name="rule" lowerBound="1" eType="#T-qvtbase-Rule" transient="true" eOpposite="#F-qvtbase-Rule-domain"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Domain-typedModel"
-        name="typedModel" eType="#T-qvtbase-TypedModel"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Domain-rule" name="rule" lowerBound="1" eType="#T-qvtbase-Rule"
+        transient="true" eOpposite="#F-qvtbase-Rule-domain"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Domain-typedModel" name="typedModel" eType="#T-qvtbase-TypedModel"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Function" name="Function"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Operation">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Function" name="Function" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Operation">
     <eOperations name="validateParametersAreFunctionParameter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="ParametersAreFunctionParameter"/>
@@ -84,22 +77,17 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Function-queryExpression"
-        name="queryExpression" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Function-queryExpression" name="queryExpression" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-FunctionParameter" name="FunctionParameter"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Parameter"/>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Pattern" name="Pattern"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Pattern-predicate"
-        name="predicate" ordered="false" upperBound="-1" eType="#T-qvtbase-Predicate"
-        containment="true" eOpposite="#F-qvtbase-Predicate-pattern"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Pattern-bindsTo"
-        name="bindsTo" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-FunctionParameter" name="FunctionParameter" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Parameter"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Pattern" name="Pattern" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Pattern-predicate" name="predicate" ordered="false" upperBound="-1"
+        eType="#T-qvtbase-Predicate" containment="true" eOpposite="#F-qvtbase-Predicate-pattern"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Pattern-bindsTo" name="bindsTo" ordered="false" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Predicate" name="Predicate"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Predicate" name="Predicate" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
     <eOperations name="validateConditionIsBoolean" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="ConditionIsBoolean"/>
@@ -115,19 +103,16 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Predicate-conditionExpression"
-        name="conditionExpression" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Predicate-conditionExpression" name="conditionExpression" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="predicate"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Predicate-pattern"
-        name="pattern" lowerBound="1" eType="#T-qvtbase-Pattern" transient="true"
-        eOpposite="#F-qvtbase-Pattern-predicate"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Predicate-pattern" name="pattern" lowerBound="1" eType="#T-qvtbase-Pattern"
+        transient="true" eOpposite="#F-qvtbase-Pattern-predicate"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Rule" name="Rule" abstract="true"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-NamedElement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Rule" name="Rule" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-NamedElement">
     <eOperations name="validateDomainNameIsUnique" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="DomainNameIsUnique"/>
@@ -173,22 +158,17 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-domain"
-        name="domain" upperBound="-1" eType="#T-qvtbase-Domain" containment="true"
-        eOpposite="#F-qvtbase-Domain-rule"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtbase-Rule-isAbstract"
-        name="isAbstract" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-domain" name="domain" upperBound="-1" eType="#T-qvtbase-Domain"
+        containment="true" eOpposite="#F-qvtbase-Domain-rule"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtbase-Rule-isAbstract" name="isAbstract" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-overridden"
-        name="overridden" eType="#T-qvtbase-Rule" eOpposite="#F-qvtbase-Rule-overrides"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-overrides"
-        name="overrides" upperBound="-1" eType="#T-qvtbase-Rule" eOpposite="#F-qvtbase-Rule-overridden"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-transformation"
-        name="transformation" eType="#T-qvtbase-Transformation" transient="true" resolveProxies="false"
-        eOpposite="#F-qvtbase-Transformation-rule"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-overridden" name="overridden" eType="#T-qvtbase-Rule" eOpposite="#F-qvtbase-Rule-overrides"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-overrides" name="overrides" upperBound="-1" eType="#T-qvtbase-Rule"
+        eOpposite="#F-qvtbase-Rule-overridden"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Rule-transformation" name="transformation" eType="#T-qvtbase-Transformation"
+        transient="true" resolveProxies="false" eOpposite="#F-qvtbase-Transformation-rule"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Transformation" name="Transformation"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Class">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-Transformation" name="Transformation" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Class">
     <eOperations name="getFunction" lowerBound="1" eType="#T-qvtbase-Function">
       <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eOperations>
@@ -255,40 +235,32 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-ownedTag"
-        name="ownedTag" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Annotation"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-modelParameter"
-        name="modelParameter" upperBound="-1" eType="#T-qvtbase-TypedModel" containment="true"
-        eOpposite="#F-qvtbase-TypedModel-transformation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-rule"
-        name="rule" ordered="false" upperBound="-1" eType="#T-qvtbase-Rule" containment="true"
-        eOpposite="#F-qvtbase-Rule-transformation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-extends"
-        name="extends" eType="#T-qvtbase-Transformation">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-ownedTag" name="ownedTag" ordered="false" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Annotation" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-modelParameter" name="modelParameter" upperBound="-1"
+        eType="#T-qvtbase-TypedModel" containment="true" eOpposite="#F-qvtbase-TypedModel-transformation"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-rule" name="rule" ordered="false" upperBound="-1"
+        eType="#T-qvtbase-Rule" containment="true" eOpposite="#F-qvtbase-Rule-transformation"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-extends" name="extends" eType="#T-qvtbase-Transformation">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="extendedBy"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-ownedContext"
-        name="ownedContext" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-Transformation-ownedContext" name="ownedContext" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-TypedModel" name="TypedModel"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-NamedElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-TypedModel-transformation"
-        name="transformation" lowerBound="1" eType="#T-qvtbase-Transformation" transient="true"
-        eOpposite="#F-qvtbase-Transformation-modelParameter"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-TypedModel-usedPackage"
-        name="usedPackage" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Package"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-TypedModel-dependsOn"
-        name="dependsOn" ordered="false" upperBound="-1" eType="#T-qvtbase-TypedModel">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtbase-TypedModel" name="TypedModel" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-NamedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-TypedModel-transformation" name="transformation" lowerBound="1"
+        eType="#T-qvtbase-Transformation" transient="true" eOpposite="#F-qvtbase-Transformation-modelParameter"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-TypedModel-usedPackage" name="usedPackage" ordered="false" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Package"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-TypedModel-dependsOn" name="dependsOn" ordered="false" upperBound="-1"
+        eType="#T-qvtbase-TypedModel">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="dependent"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-TypedModel-ownedContext"
-        name="ownedContext" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtbase-TypedModel-ownedContext" name="ownedContext" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"
         containment="true"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel
index 0ef03dcb0..11efc1ae5 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel
+++ b/plugins/org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2017 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.qvtd.pivot.qvtbase/emf-gen" modelPluginID="org.eclipse.qvtd.pivot.qvtbase"
     modelName="QVTbase" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
     copyrightFields="false" runtimeVersion="2.7" language="" usedGenPackages="../../org.eclipse.ocl.pivot/model/Pivot.genmodel#//pivot"
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcoreTables.java b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcoreTables.java
index a417c7227..e45ec7a9e 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcoreTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/QVTcoreTables.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * <copyright>
  *
- * Copyright (c) 2013, 2017 Willink Transformations and others.
+ * Copyright (c) 2013, 2018 Willink Transformations 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
@@ -496,213 +496,213 @@ public class QVTcoreTables
 		}
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Area =
-			{
-				Fragments._Area__OclAny /* 0 */,
-				Fragments._Area__OclElement /* 1 */,
-				Fragments._Area__Visitable /* 2 */,
-				Fragments._Area__Element /* 3 */,
-				Fragments._Area__Area /* 4 */
-			};
+		{
+			Fragments._Area__OclAny /* 0 */,
+			Fragments._Area__OclElement /* 1 */,
+			Fragments._Area__Visitable /* 2 */,
+			Fragments._Area__Element /* 3 */,
+			Fragments._Area__Area /* 4 */
+		};
 		private static final int @NonNull [] __Area = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Assignment =
-			{
-				Fragments._Assignment__OclAny /* 0 */,
-				Fragments._Assignment__OclElement /* 1 */,
-				Fragments._Assignment__Visitable /* 2 */,
-				Fragments._Assignment__Element /* 3 */,
-				Fragments._Assignment__Assignment /* 4 */
-			};
+		{
+			Fragments._Assignment__OclAny /* 0 */,
+			Fragments._Assignment__OclElement /* 1 */,
+			Fragments._Assignment__Visitable /* 2 */,
+			Fragments._Assignment__Element /* 3 */,
+			Fragments._Assignment__Assignment /* 4 */
+		};
 		private static final int @NonNull [] __Assignment = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _BottomPattern =
-			{
-				Fragments._BottomPattern__OclAny /* 0 */,
-				Fragments._BottomPattern__OclElement /* 1 */,
-				Fragments._BottomPattern__Visitable /* 2 */,
-				Fragments._BottomPattern__Element /* 3 */,
-				Fragments._BottomPattern__Pattern /* 4 */,
-				Fragments._BottomPattern__CorePattern /* 5 */,
-				Fragments._BottomPattern__BottomPattern /* 6 */
-			};
+		{
+			Fragments._BottomPattern__OclAny /* 0 */,
+			Fragments._BottomPattern__OclElement /* 1 */,
+			Fragments._BottomPattern__Visitable /* 2 */,
+			Fragments._BottomPattern__Element /* 3 */,
+			Fragments._BottomPattern__Pattern /* 4 */,
+			Fragments._BottomPattern__CorePattern /* 5 */,
+			Fragments._BottomPattern__BottomPattern /* 6 */
+		};
 		private static final int @NonNull [] __BottomPattern = { 1,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _BottomVariable =
-			{
-				Fragments._BottomVariable__OclAny /* 0 */,
-				Fragments._BottomVariable__OclElement /* 1 */,
-				Fragments._BottomVariable__Nameable /* 2 */,
-				Fragments._BottomVariable__Visitable /* 2 */,
-				Fragments._BottomVariable__Element /* 3 */,
-				Fragments._BottomVariable__NamedElement /* 4 */,
-				Fragments._BottomVariable__TypedElement /* 5 */,
-				Fragments._BottomVariable__VariableDeclaration /* 6 */,
-				Fragments._BottomVariable__Variable /* 7 */,
-				Fragments._BottomVariable__BottomVariable /* 8 */
-			};
+		{
+			Fragments._BottomVariable__OclAny /* 0 */,
+			Fragments._BottomVariable__OclElement /* 1 */,
+			Fragments._BottomVariable__Nameable /* 2 */,
+			Fragments._BottomVariable__Visitable /* 2 */,
+			Fragments._BottomVariable__Element /* 3 */,
+			Fragments._BottomVariable__NamedElement /* 4 */,
+			Fragments._BottomVariable__TypedElement /* 5 */,
+			Fragments._BottomVariable__VariableDeclaration /* 6 */,
+			Fragments._BottomVariable__Variable /* 7 */,
+			Fragments._BottomVariable__BottomVariable /* 8 */
+		};
 		private static final int @NonNull [] __BottomVariable = { 1,1,2,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _CoreDomain =
-			{
-				Fragments._CoreDomain__OclAny /* 0 */,
-				Fragments._CoreDomain__OclElement /* 1 */,
-				Fragments._CoreDomain__Nameable /* 2 */,
-				Fragments._CoreDomain__ReferringElement /* 2 */,
-				Fragments._CoreDomain__Visitable /* 2 */,
-				Fragments._CoreDomain__Element /* 3 */,
-				Fragments._CoreDomain__Area /* 4 */,
-				Fragments._CoreDomain__NamedElement /* 4 */,
-				Fragments._CoreDomain__Domain /* 5 */,
-				Fragments._CoreDomain__CoreDomain /* 6 */
-			};
+		{
+			Fragments._CoreDomain__OclAny /* 0 */,
+			Fragments._CoreDomain__OclElement /* 1 */,
+			Fragments._CoreDomain__Nameable /* 2 */,
+			Fragments._CoreDomain__ReferringElement /* 2 */,
+			Fragments._CoreDomain__Visitable /* 2 */,
+			Fragments._CoreDomain__Element /* 3 */,
+			Fragments._CoreDomain__Area /* 4 */,
+			Fragments._CoreDomain__NamedElement /* 4 */,
+			Fragments._CoreDomain__Domain /* 5 */,
+			Fragments._CoreDomain__CoreDomain /* 6 */
+		};
 		private static final int @NonNull [] __CoreDomain = { 1,1,3,1,2,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _CoreModel =
-			{
-				Fragments._CoreModel__OclAny /* 0 */,
-				Fragments._CoreModel__OclElement /* 1 */,
-				Fragments._CoreModel__Nameable /* 2 */,
-				Fragments._CoreModel__Visitable /* 2 */,
-				Fragments._CoreModel__Element /* 3 */,
-				Fragments._CoreModel__NamedElement /* 4 */,
-				Fragments._CoreModel__Namespace /* 5 */,
-				Fragments._CoreModel__Model /* 6 */,
-				Fragments._CoreModel__BaseModel /* 7 */,
-				Fragments._CoreModel__CoreModel /* 8 */
-			};
+		{
+			Fragments._CoreModel__OclAny /* 0 */,
+			Fragments._CoreModel__OclElement /* 1 */,
+			Fragments._CoreModel__Nameable /* 2 */,
+			Fragments._CoreModel__Visitable /* 2 */,
+			Fragments._CoreModel__Element /* 3 */,
+			Fragments._CoreModel__NamedElement /* 4 */,
+			Fragments._CoreModel__Namespace /* 5 */,
+			Fragments._CoreModel__Model /* 6 */,
+			Fragments._CoreModel__BaseModel /* 7 */,
+			Fragments._CoreModel__CoreModel /* 8 */
+		};
 		private static final int @NonNull [] __CoreModel = { 1,1,2,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _CorePattern =
-			{
-				Fragments._CorePattern__OclAny /* 0 */,
-				Fragments._CorePattern__OclElement /* 1 */,
-				Fragments._CorePattern__Visitable /* 2 */,
-				Fragments._CorePattern__Element /* 3 */,
-				Fragments._CorePattern__Pattern /* 4 */,
-				Fragments._CorePattern__CorePattern /* 5 */
-			};
+		{
+			Fragments._CorePattern__OclAny /* 0 */,
+			Fragments._CorePattern__OclElement /* 1 */,
+			Fragments._CorePattern__Visitable /* 2 */,
+			Fragments._CorePattern__Element /* 3 */,
+			Fragments._CorePattern__Pattern /* 4 */,
+			Fragments._CorePattern__CorePattern /* 5 */
+		};
 		private static final int @NonNull [] __CorePattern = { 1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _EnforcementMode =
-			{
-				Fragments._EnforcementMode__OclAny /* 0 */,
-				Fragments._EnforcementMode__OclElement /* 1 */,
-				Fragments._EnforcementMode__OclType /* 2 */,
-				Fragments._EnforcementMode__OclEnumeration /* 3 */,
-				Fragments._EnforcementMode__EnforcementMode /* 4 */
-			};
+		{
+			Fragments._EnforcementMode__OclAny /* 0 */,
+			Fragments._EnforcementMode__OclElement /* 1 */,
+			Fragments._EnforcementMode__OclType /* 2 */,
+			Fragments._EnforcementMode__OclEnumeration /* 3 */,
+			Fragments._EnforcementMode__EnforcementMode /* 4 */
+		};
 		private static final int @NonNull [] __EnforcementMode = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _EnforcementOperation =
-			{
-				Fragments._EnforcementOperation__OclAny /* 0 */,
-				Fragments._EnforcementOperation__OclElement /* 1 */,
-				Fragments._EnforcementOperation__Visitable /* 2 */,
-				Fragments._EnforcementOperation__Element /* 3 */,
-				Fragments._EnforcementOperation__EnforcementOperation /* 4 */
-			};
+		{
+			Fragments._EnforcementOperation__OclAny /* 0 */,
+			Fragments._EnforcementOperation__OclElement /* 1 */,
+			Fragments._EnforcementOperation__Visitable /* 2 */,
+			Fragments._EnforcementOperation__Element /* 3 */,
+			Fragments._EnforcementOperation__EnforcementOperation /* 4 */
+		};
 		private static final int @NonNull [] __EnforcementOperation = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _GuardPattern =
-			{
-				Fragments._GuardPattern__OclAny /* 0 */,
-				Fragments._GuardPattern__OclElement /* 1 */,
-				Fragments._GuardPattern__Visitable /* 2 */,
-				Fragments._GuardPattern__Element /* 3 */,
-				Fragments._GuardPattern__Pattern /* 4 */,
-				Fragments._GuardPattern__CorePattern /* 5 */,
-				Fragments._GuardPattern__GuardPattern /* 6 */
-			};
+		{
+			Fragments._GuardPattern__OclAny /* 0 */,
+			Fragments._GuardPattern__OclElement /* 1 */,
+			Fragments._GuardPattern__Visitable /* 2 */,
+			Fragments._GuardPattern__Element /* 3 */,
+			Fragments._GuardPattern__Pattern /* 4 */,
+			Fragments._GuardPattern__CorePattern /* 5 */,
+			Fragments._GuardPattern__GuardPattern /* 6 */
+		};
 		private static final int @NonNull [] __GuardPattern = { 1,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _GuardVariable =
-			{
-				Fragments._GuardVariable__OclAny /* 0 */,
-				Fragments._GuardVariable__OclElement /* 1 */,
-				Fragments._GuardVariable__Nameable /* 2 */,
-				Fragments._GuardVariable__Visitable /* 2 */,
-				Fragments._GuardVariable__Element /* 3 */,
-				Fragments._GuardVariable__NamedElement /* 4 */,
-				Fragments._GuardVariable__TypedElement /* 5 */,
-				Fragments._GuardVariable__VariableDeclaration /* 6 */,
-				Fragments._GuardVariable__Variable /* 7 */,
-				Fragments._GuardVariable__GuardVariable /* 8 */
-			};
+		{
+			Fragments._GuardVariable__OclAny /* 0 */,
+			Fragments._GuardVariable__OclElement /* 1 */,
+			Fragments._GuardVariable__Nameable /* 2 */,
+			Fragments._GuardVariable__Visitable /* 2 */,
+			Fragments._GuardVariable__Element /* 3 */,
+			Fragments._GuardVariable__NamedElement /* 4 */,
+			Fragments._GuardVariable__TypedElement /* 5 */,
+			Fragments._GuardVariable__VariableDeclaration /* 6 */,
+			Fragments._GuardVariable__Variable /* 7 */,
+			Fragments._GuardVariable__GuardVariable /* 8 */
+		};
 		private static final int @NonNull [] __GuardVariable = { 1,1,2,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Mapping =
-			{
-				Fragments._Mapping__OclAny /* 0 */,
-				Fragments._Mapping__OclElement /* 1 */,
-				Fragments._Mapping__Nameable /* 2 */,
-				Fragments._Mapping__Visitable /* 2 */,
-				Fragments._Mapping__Element /* 3 */,
-				Fragments._Mapping__Area /* 4 */,
-				Fragments._Mapping__NamedElement /* 4 */,
-				Fragments._Mapping__Rule /* 5 */,
-				Fragments._Mapping__Mapping /* 6 */
-			};
+		{
+			Fragments._Mapping__OclAny /* 0 */,
+			Fragments._Mapping__OclElement /* 1 */,
+			Fragments._Mapping__Nameable /* 2 */,
+			Fragments._Mapping__Visitable /* 2 */,
+			Fragments._Mapping__Element /* 3 */,
+			Fragments._Mapping__Area /* 4 */,
+			Fragments._Mapping__NamedElement /* 4 */,
+			Fragments._Mapping__Rule /* 5 */,
+			Fragments._Mapping__Mapping /* 6 */
+		};
 		private static final int @NonNull [] __Mapping = { 1,1,2,1,2,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _NavigationAssignment =
-			{
-				Fragments._NavigationAssignment__OclAny /* 0 */,
-				Fragments._NavigationAssignment__OclElement /* 1 */,
-				Fragments._NavigationAssignment__Visitable /* 2 */,
-				Fragments._NavigationAssignment__Element /* 3 */,
-				Fragments._NavigationAssignment__Assignment /* 4 */,
-				Fragments._NavigationAssignment__NavigationAssignment /* 5 */
-			};
+		{
+			Fragments._NavigationAssignment__OclAny /* 0 */,
+			Fragments._NavigationAssignment__OclElement /* 1 */,
+			Fragments._NavigationAssignment__Visitable /* 2 */,
+			Fragments._NavigationAssignment__Element /* 3 */,
+			Fragments._NavigationAssignment__Assignment /* 4 */,
+			Fragments._NavigationAssignment__NavigationAssignment /* 5 */
+		};
 		private static final int @NonNull [] __NavigationAssignment = { 1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _OppositePropertyAssignment =
-			{
-				Fragments._OppositePropertyAssignment__OclAny /* 0 */,
-				Fragments._OppositePropertyAssignment__OclElement /* 1 */,
-				Fragments._OppositePropertyAssignment__Visitable /* 2 */,
-				Fragments._OppositePropertyAssignment__Element /* 3 */,
-				Fragments._OppositePropertyAssignment__Assignment /* 4 */,
-				Fragments._OppositePropertyAssignment__NavigationAssignment /* 5 */,
-				Fragments._OppositePropertyAssignment__OppositePropertyAssignment /* 6 */
-			};
+		{
+			Fragments._OppositePropertyAssignment__OclAny /* 0 */,
+			Fragments._OppositePropertyAssignment__OclElement /* 1 */,
+			Fragments._OppositePropertyAssignment__Visitable /* 2 */,
+			Fragments._OppositePropertyAssignment__Element /* 3 */,
+			Fragments._OppositePropertyAssignment__Assignment /* 4 */,
+			Fragments._OppositePropertyAssignment__NavigationAssignment /* 5 */,
+			Fragments._OppositePropertyAssignment__OppositePropertyAssignment /* 6 */
+		};
 		private static final int @NonNull [] __OppositePropertyAssignment = { 1,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _PropertyAssignment =
-			{
-				Fragments._PropertyAssignment__OclAny /* 0 */,
-				Fragments._PropertyAssignment__OclElement /* 1 */,
-				Fragments._PropertyAssignment__Visitable /* 2 */,
-				Fragments._PropertyAssignment__Element /* 3 */,
-				Fragments._PropertyAssignment__Assignment /* 4 */,
-				Fragments._PropertyAssignment__NavigationAssignment /* 5 */,
-				Fragments._PropertyAssignment__PropertyAssignment /* 6 */
-			};
+		{
+			Fragments._PropertyAssignment__OclAny /* 0 */,
+			Fragments._PropertyAssignment__OclElement /* 1 */,
+			Fragments._PropertyAssignment__Visitable /* 2 */,
+			Fragments._PropertyAssignment__Element /* 3 */,
+			Fragments._PropertyAssignment__Assignment /* 4 */,
+			Fragments._PropertyAssignment__NavigationAssignment /* 5 */,
+			Fragments._PropertyAssignment__PropertyAssignment /* 6 */
+		};
 		private static final int @NonNull [] __PropertyAssignment = { 1,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _RealizedVariable =
-			{
-				Fragments._RealizedVariable__OclAny /* 0 */,
-				Fragments._RealizedVariable__OclElement /* 1 */,
-				Fragments._RealizedVariable__Nameable /* 2 */,
-				Fragments._RealizedVariable__Visitable /* 2 */,
-				Fragments._RealizedVariable__Element /* 3 */,
-				Fragments._RealizedVariable__NamedElement /* 4 */,
-				Fragments._RealizedVariable__TypedElement /* 5 */,
-				Fragments._RealizedVariable__VariableDeclaration /* 6 */,
-				Fragments._RealizedVariable__Variable /* 7 */,
-				Fragments._RealizedVariable__RealizedVariable /* 8 */
-			};
+		{
+			Fragments._RealizedVariable__OclAny /* 0 */,
+			Fragments._RealizedVariable__OclElement /* 1 */,
+			Fragments._RealizedVariable__Nameable /* 2 */,
+			Fragments._RealizedVariable__Visitable /* 2 */,
+			Fragments._RealizedVariable__Element /* 3 */,
+			Fragments._RealizedVariable__NamedElement /* 4 */,
+			Fragments._RealizedVariable__TypedElement /* 5 */,
+			Fragments._RealizedVariable__VariableDeclaration /* 6 */,
+			Fragments._RealizedVariable__Variable /* 7 */,
+			Fragments._RealizedVariable__RealizedVariable /* 8 */
+		};
 		private static final int @NonNull [] __RealizedVariable = { 1,1,2,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _VariableAssignment =
-			{
-				Fragments._VariableAssignment__OclAny /* 0 */,
-				Fragments._VariableAssignment__OclElement /* 1 */,
-				Fragments._VariableAssignment__Visitable /* 2 */,
-				Fragments._VariableAssignment__Element /* 3 */,
-				Fragments._VariableAssignment__Assignment /* 4 */,
-				Fragments._VariableAssignment__VariableAssignment /* 5 */
-			};
+		{
+			Fragments._VariableAssignment__OclAny /* 0 */,
+			Fragments._VariableAssignment__OclElement /* 1 */,
+			Fragments._VariableAssignment__Visitable /* 2 */,
+			Fragments._VariableAssignment__Element /* 3 */,
+			Fragments._VariableAssignment__Assignment /* 4 */,
+			Fragments._VariableAssignment__VariableAssignment /* 5 */
+		};
 		private static final int @NonNull [] __VariableAssignment = { 1,1,1,1,1,1 };
 
 		/**
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/impl/QVTcorePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/impl/QVTcorePackageImpl.java
index 03a3609c4..f5062fdfc 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/impl/QVTcorePackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/impl/QVTcorePackageImpl.java
@@ -212,13 +212,12 @@ public class QVTcorePackageImpl extends EPackageImpl implements QVTcorePackage {
 
 		// Register package validator
 		EValidator.Registry.INSTANCE.put
-		(theQVTcorePackage,
-			new EValidator.Descriptor() {
-			@Override
-			public EValidator getEValidator() {
-				return QVTcoreValidator.INSTANCE;
-			}
-		});
+			(theQVTcorePackage,
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return QVTcoreValidator.INSTANCE;
+				 }
+			 });
 
 		// Mark meta-data to indicate it can't be changed
 		theQVTcorePackage.freeze();
@@ -1248,10 +1247,10 @@ public class QVTcorePackageImpl extends EPackageImpl implements QVTcorePackage {
 	protected void createEcoreAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore";
 		addAnnotation
-		(this,
-			source,
-			new String[] {
-		});
+		  (this,
+		   source,
+		   new String[] {
+		   });
 	}
 
 	/**
@@ -1263,35 +1262,35 @@ public class QVTcorePackageImpl extends EPackageImpl implements QVTcorePackage {
 	protected void createEmofAnnotations() {
 		String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
 		addAnnotation
-		(getAssignment_Value(),
-			source,
-			new String[] {
-				"body", "valueAssignment"
-		});
+		  (getAssignment_Value(),
+		   source,
+		   new String[] {
+			   "body", "valueAssignment"
+		   });
 		addAnnotation
-		(getNavigationAssignment_SlotExpression(),
-			source,
-			new String[] {
-				"body", "slotAssignment"
-		});
+		  (getNavigationAssignment_SlotExpression(),
+		   source,
+		   new String[] {
+			   "body", "slotAssignment"
+		   });
 		addAnnotation
-		(getOppositePropertyAssignment_TargetProperty(),
-			source,
-			new String[] {
-				"body", "assignment"
-		});
+		  (getOppositePropertyAssignment_TargetProperty(),
+		   source,
+		   new String[] {
+			   "body", "assignment"
+		   });
 		addAnnotation
-		(getPropertyAssignment_TargetProperty(),
-			source,
-			new String[] {
-				"body", "assignment"
-		});
+		  (getPropertyAssignment_TargetProperty(),
+		   source,
+		   new String[] {
+			   "body", "assignment"
+		   });
 		addAnnotation
-		(getVariableAssignment_TargetVariable(),
-			source,
-			new String[] {
-				"body", "assignment"
-		});
+		  (getVariableAssignment_TargetVariable(),
+		   source,
+		   new String[] {
+			   "body", "assignment"
+		   });
 	}
 
 	/**
@@ -1303,113 +1302,113 @@ public class QVTcorePackageImpl extends EPackageImpl implements QVTcorePackage {
 	protected void createUMLAnnotations() {
 		String source = "http://www.eclipse.org/uml2/2.0.0/UML";
 		addAnnotation
-		(getBottomPattern__ValidateVariablesAreBottomVariables__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "VariablesAreBottomVariables"
-		});
+		  (getBottomPattern__ValidateVariablesAreBottomVariables__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "VariablesAreBottomVariables"
+		   });
 		addAnnotation
-		(getBottomVariable__ValidateCompatibleTypeForInitializer__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForInitializer"
-		});
+		  (getBottomVariable__ValidateCompatibleTypeForInitializer__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForInitializer"
+		   });
 		addAnnotation
-		(getBottomVariable__ValidateCompatibleNullityForInitializer__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleNullityForInitializer"
-		});
+		  (getBottomVariable__ValidateCompatibleNullityForInitializer__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleNullityForInitializer"
+		   });
 		addAnnotation
-		(getGuardPattern__ValidateVariablesAreGuardVariables__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "VariablesAreGuardVariables"
-		});
+		  (getGuardPattern__ValidateVariablesAreGuardVariables__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "VariablesAreGuardVariables"
+		   });
 		addAnnotation
-		(getGuardVariable__ValidateNoInitializer__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NoInitializer"
-		});
+		  (getGuardVariable__ValidateNoInitializer__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NoInitializer"
+		   });
 		addAnnotation
-		(getMapping__ValidateDomainsAreCoreDomains__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "DomainsAreCoreDomains"
-		});
+		  (getMapping__ValidateDomainsAreCoreDomains__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "DomainsAreCoreDomains"
+		   });
 		addAnnotation
-		(getMapping__ValidateNestedNameIsNull__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NestedNameIsNull"
-		});
+		  (getMapping__ValidateNestedNameIsNull__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NestedNameIsNull"
+		   });
 		addAnnotation
-		(getMapping__ValidateRootNameIsNotNull__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "RootNameIsNotNull"
-		});
+		  (getMapping__ValidateRootNameIsNotNull__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "RootNameIsNotNull"
+		   });
 		addAnnotation
-		(getOppositePropertyAssignment__ValidateCompatibleTypeForPartialValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForPartialValue"
-		});
+		  (getOppositePropertyAssignment__ValidateCompatibleTypeForPartialValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForPartialValue"
+		   });
 		addAnnotation
-		(getOppositePropertyAssignment__ValidateCompatibleTypeForTotalValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForTotalValue"
-		});
+		  (getOppositePropertyAssignment__ValidateCompatibleTypeForTotalValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForTotalValue"
+		   });
 		addAnnotation
-		(getOppositePropertyAssignment__ValidateOppositePropertyIsImplicit__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "OppositePropertyIsImplicit"
-		});
+		  (getOppositePropertyAssignment__ValidateOppositePropertyIsImplicit__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "OppositePropertyIsImplicit"
+		   });
 		addAnnotation
-		(getOppositePropertyAssignment__ValidateTargetPropetyIsSlotProperty__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "TargetPropetyIsSlotProperty"
-		});
+		  (getOppositePropertyAssignment__ValidateTargetPropetyIsSlotProperty__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "TargetPropetyIsSlotProperty"
+		   });
 		addAnnotation
-		(getPropertyAssignment__ValidateCompatibleTypeForPartialValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForPartialValue"
-		});
+		  (getPropertyAssignment__ValidateCompatibleTypeForPartialValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForPartialValue"
+		   });
 		addAnnotation
-		(getPropertyAssignment__ValidateCompatibleTypeForTotalValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForTotalValue"
-		});
+		  (getPropertyAssignment__ValidateCompatibleTypeForTotalValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForTotalValue"
+		   });
 		addAnnotation
-		(getPropertyAssignment__ValidatePropertyIsNotImplicit__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "PropertyIsNotImplicit"
-		});
+		  (getPropertyAssignment__ValidatePropertyIsNotImplicit__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "PropertyIsNotImplicit"
+		   });
 		addAnnotation
-		(getPropertyAssignment__ValidateTargetPropertyIsSlotProperty__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "TargetPropertyIsSlotProperty"
-		});
+		  (getPropertyAssignment__ValidateTargetPropertyIsSlotProperty__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "TargetPropertyIsSlotProperty"
+		   });
 		addAnnotation
-		(getRealizedVariable__ValidateNonDataTypeForType__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NonDataTypeForType"
-		});
+		  (getRealizedVariable__ValidateNonDataTypeForType__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NonDataTypeForType"
+		   });
 		addAnnotation
-		(getVariableAssignment__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForValue"
-		});
+		  (getVariableAssignment__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForValue"
+		   });
 	}
 
 } //QVTcorePackageImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/AbstractQVTcoreAS2XMIidVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/AbstractQVTcoreAS2XMIidVisitor.java
index b8aef09fb..d0a8429b6 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/AbstractQVTcoreAS2XMIidVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/AbstractQVTcoreAS2XMIidVisitor.java
@@ -30,10 +30,9 @@ import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbaseAS2XMIidVisitor;
  * until a non-interface super-class is found). In the absence of any
  * suitable first super class, the method delegates to visiting().
  */
-@SuppressWarnings("deprecation")
 public abstract class AbstractQVTcoreAS2XMIidVisitor
-extends QVTbaseAS2XMIidVisitor
-implements QVTcoreVisitor<Boolean>
+	extends QVTbaseAS2XMIidVisitor
+	implements QVTcoreVisitor<Boolean>
 {
 	/**
 	 * Initializes me with an initial value for my result.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/QVTcoreValidator.java b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/QVTcoreValidator.java
index ab93ac82f..63fc145d1 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/QVTcoreValidator.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/emf-gen/org/eclipse/qvtd/pivot/qvtcore/util/QVTcoreValidator.java
@@ -250,7 +250,7 @@ public class QVTcoreValidator extends EObjectValidator {
 	 */
 	@Override
 	protected EPackage getEPackage() {
-		return QVTcorePackage.eINSTANCE;
+	  return QVTcorePackage.eINSTANCE;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore b/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore
index 61b46be41..60b838558 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore
@@ -1,42 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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" xmi:id="P-qvtcore" name="qvtcore" nsURI="http://www.eclipse.org/qvt/2015/QVTcore"
-    nsPrefix="qvtc">
+<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"
+    xmi:id="P-qvtcore" name="qvtcore" nsURI="http://www.eclipse.org/qvt/2015/QVTcore" nsPrefix="qvtc">
   <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
     <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
     <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
     <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
   </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-Area" name="Area" abstract="true"
-      interface="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Area-guardPattern"
-        name="guardPattern" lowerBound="1" eType="#T-qvtcore-GuardPattern" containment="true"
-        eOpposite="#F-qvtcore-GuardPattern-area"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Area-bottomPattern"
-        name="bottomPattern" lowerBound="1" eType="#T-qvtcore-BottomPattern" containment="true"
-        eOpposite="#F-qvtcore-BottomPattern-area"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-Area" name="Area" abstract="true" interface="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Area-guardPattern" name="guardPattern" lowerBound="1" eType="#T-qvtcore-GuardPattern"
+        containment="true" eOpposite="#F-qvtcore-GuardPattern-area"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Area-bottomPattern" name="bottomPattern" lowerBound="1" eType="#T-qvtcore-BottomPattern"
+        containment="true" eOpposite="#F-qvtcore-BottomPattern-area"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-Assignment" name="Assignment"
-      abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Assignment-bottomPattern"
-        name="bottomPattern" lowerBound="1" eType="#T-qvtcore-BottomPattern" transient="true"
-        eOpposite="#F-qvtcore-BottomPattern-assignment"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Assignment-value"
-        name="value" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-Assignment" name="Assignment" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Assignment-bottomPattern" name="bottomPattern" lowerBound="1" eType="#T-qvtcore-BottomPattern"
+        transient="true" eOpposite="#F-qvtcore-BottomPattern-assignment"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Assignment-value" name="value" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
         containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="valueAssignment"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtcore-Assignment-isDefault"
-        name="isDefault" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtcore-Assignment-isDefault" name="isDefault" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtcore-Assignment-isPartial"
-        name="isPartial" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtcore-Assignment-isPartial" name="isPartial" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false" unsettable="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-BottomPattern" name="BottomPattern"
-      eSuperTypes="#T-qvtcore-CorePattern">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-BottomPattern" name="BottomPattern" eSuperTypes="#T-qvtcore-CorePattern">
     <eOperations name="validateVariablesAreBottomVariables" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="VariablesAreBottomVariables"/>
@@ -52,20 +42,16 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-BottomPattern-area"
-        name="area" lowerBound="1" eType="#T-qvtcore-Area" transient="true" eOpposite="#F-qvtcore-Area-bottomPattern"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-BottomPattern-assignment"
-        name="assignment" ordered="false" upperBound="-1" eType="#T-qvtcore-Assignment"
-        containment="true" eOpposite="#F-qvtcore-Assignment-bottomPattern"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-BottomPattern-enforcementOperation"
-        name="enforcementOperation" ordered="false" upperBound="-1" eType="#T-qvtcore-EnforcementOperation"
-        containment="true" eOpposite="#F-qvtcore-EnforcementOperation-bottomPattern"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-BottomPattern-realizedVariable"
-        name="realizedVariable" ordered="false" upperBound="-1" eType="#T-qvtcore-RealizedVariable"
-        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-BottomPattern-area" name="area" lowerBound="1" eType="#T-qvtcore-Area"
+        transient="true" eOpposite="#F-qvtcore-Area-bottomPattern"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-BottomPattern-assignment" name="assignment" ordered="false" upperBound="-1"
+        eType="#T-qvtcore-Assignment" containment="true" eOpposite="#F-qvtcore-Assignment-bottomPattern"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-BottomPattern-enforcementOperation" name="enforcementOperation"
+        ordered="false" upperBound="-1" eType="#T-qvtcore-EnforcementOperation" containment="true" eOpposite="#F-qvtcore-EnforcementOperation-bottomPattern"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-BottomPattern-realizedVariable" name="realizedVariable" ordered="false"
+        upperBound="-1" eType="#T-qvtcore-RealizedVariable" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-BottomVariable" name="BottomVariable"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-BottomVariable" name="BottomVariable" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
     <eOperations name="validateCompatibleTypeForInitializer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="CompatibleTypeForInitializer"/>
@@ -97,29 +83,21 @@
       </eParameters>
     </eOperations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-CoreDomain" name="CoreDomain"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Domain #T-qvtcore-Area"/>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-CoreModel" name="CoreModel"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-BaseModel"/>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-CorePattern" name="CorePattern"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Pattern">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-CoreDomain" name="CoreDomain" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Domain #T-qvtcore-Area"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-CoreModel" name="CoreModel" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-BaseModel"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-CorePattern" name="CorePattern" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Pattern">
     <eOperations name="getArea" lowerBound="1" eType="#T-qvtcore-Area"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-CorePattern-variable"
-        name="variable" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"
-        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-CorePattern-variable" name="variable" ordered="false" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-EnforcementOperation" name="EnforcementOperation"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtcore-EnforcementOperation-enforcementMode"
-        name="enforcementMode" eType="#T-qvtcore-EnforcementMode"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-EnforcementOperation-bottomPattern"
-        name="bottomPattern" eType="#T-qvtcore-BottomPattern" transient="true" eOpposite="#F-qvtcore-BottomPattern-enforcementOperation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-EnforcementOperation-operationCallExp"
-        name="operationCallExp" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OperationCallExp"
-        containment="true"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-EnforcementOperation" name="EnforcementOperation" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtcore-EnforcementOperation-enforcementMode" name="enforcementMode" eType="#T-qvtcore-EnforcementMode"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-EnforcementOperation-bottomPattern" name="bottomPattern" eType="#T-qvtcore-BottomPattern"
+        transient="true" eOpposite="#F-qvtcore-BottomPattern-enforcementOperation"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-EnforcementOperation-operationCallExp" name="operationCallExp"
+        lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OperationCallExp" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-GuardPattern" name="GuardPattern"
-      eSuperTypes="#T-qvtcore-CorePattern">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-GuardPattern" name="GuardPattern" eSuperTypes="#T-qvtcore-CorePattern">
     <eOperations name="validateVariablesAreGuardVariables" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="VariablesAreGuardVariables"/>
@@ -135,11 +113,10 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-GuardPattern-area"
-        name="area" lowerBound="1" eType="#T-qvtcore-Area" transient="true" eOpposite="#F-qvtcore-Area-guardPattern"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-GuardPattern-area" name="area" lowerBound="1" eType="#T-qvtcore-Area"
+        transient="true" eOpposite="#F-qvtcore-Area-guardPattern"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-GuardVariable" name="GuardVariable"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-GuardVariable" name="GuardVariable" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
     <eOperations name="validateNoInitializer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="NoInitializer"/>
@@ -156,8 +133,7 @@
       </eParameters>
     </eOperations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-Mapping" name="Mapping"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Rule #T-qvtcore-Area">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-Mapping" name="Mapping" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Rule #T-qvtcore-Area">
     <eOperations name="validateDomainsAreCoreDomains" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="DomainsAreCoreDomains"/>
@@ -203,30 +179,23 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Mapping-context"
-        name="context" eType="#T-qvtcore-Mapping" eOpposite="#F-qvtcore-Mapping-local"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Mapping-local"
-        name="local" ordered="false" upperBound="-1" eType="#T-qvtcore-Mapping" containment="true"
-        eOpposite="#F-qvtcore-Mapping-context"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Mapping-refinement"
-        name="refinement" ordered="false" upperBound="-1" eType="#T-qvtcore-Mapping"
-        eOpposite="#F-qvtcore-Mapping-specification"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Mapping-specification"
-        name="specification" ordered="false" upperBound="-1" eType="#T-qvtcore-Mapping"
-        eOpposite="#F-qvtcore-Mapping-refinement"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Mapping-context" name="context" eType="#T-qvtcore-Mapping" eOpposite="#F-qvtcore-Mapping-local"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Mapping-local" name="local" ordered="false" upperBound="-1" eType="#T-qvtcore-Mapping"
+        containment="true" eOpposite="#F-qvtcore-Mapping-context"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Mapping-refinement" name="refinement" ordered="false" upperBound="-1"
+        eType="#T-qvtcore-Mapping" eOpposite="#F-qvtcore-Mapping-specification"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-Mapping-specification" name="specification" ordered="false" upperBound="-1"
+        eType="#T-qvtcore-Mapping" eOpposite="#F-qvtcore-Mapping-refinement"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-NavigationAssignment" name="NavigationAssignment"
-      abstract="true" eSuperTypes="#T-qvtcore-Assignment">
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-NavigationAssignment-slotExpression"
-        name="slotExpression" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-NavigationAssignment" name="NavigationAssignment" abstract="true" eSuperTypes="#T-qvtcore-Assignment">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-NavigationAssignment-slotExpression" name="slotExpression" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="slotAssignment"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-OppositePropertyAssignment"
-      name="OppositePropertyAssignment" eSuperTypes="#T-qvtcore-NavigationAssignment">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-OppositePropertyAssignment" name="OppositePropertyAssignment" eSuperTypes="#T-qvtcore-NavigationAssignment">
     <eOperations name="getReferredTargetProperty" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="body" value="targetProperty.opposite&#xA;&#xA;"/>
@@ -292,15 +261,14 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-OppositePropertyAssignment-targetProperty"
-        name="targetProperty" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-OppositePropertyAssignment-targetProperty" name="targetProperty"
+        lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="assignment"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-PropertyAssignment" name="PropertyAssignment"
-      eSuperTypes="#T-qvtcore-NavigationAssignment">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-PropertyAssignment" name="PropertyAssignment" eSuperTypes="#T-qvtcore-NavigationAssignment">
     <eOperations name="getReferredTargetProperty" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="body" value="targetProperty&#xA;&#xA;"/>
@@ -366,15 +334,14 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-PropertyAssignment-targetProperty"
-        name="targetProperty" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-PropertyAssignment-targetProperty" name="targetProperty" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="assignment"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-RealizedVariable" name="RealizedVariable"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-RealizedVariable" name="RealizedVariable" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
     <eOperations name="validateNonDataTypeForType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="NonDataTypeForType"/>
@@ -391,8 +358,7 @@
       </eParameters>
     </eOperations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-VariableAssignment" name="VariableAssignment"
-      eSuperTypes="#T-qvtcore-Assignment">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtcore-VariableAssignment" name="VariableAssignment" eSuperTypes="#T-qvtcore-Assignment">
     <eOperations name="validateCompatibleTypeForValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="CompatibleTypeForValue"/>
@@ -408,8 +374,8 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-VariableAssignment-targetVariable"
-        name="targetVariable" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtcore-VariableAssignment-targetVariable" name="targetVariable" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="assignment"/>
       </eAnnotations>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.genmodel b/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.genmodel
index cf06f961c..ed719d515 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.genmodel
+++ b/plugins/org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2017 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.qvtd.pivot.qvtcore/emf-gen" modelPluginID="org.eclipse.qvtd.pivot.qvtcore"
     modelName="QVTcore" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
     copyrightFields="false" runtimeVersion="2.7" usedGenPackages="../../org.eclipse.ocl.pivot/model/Pivot.genmodel#//pivot ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel#//qvtbase"
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java
index 549d1fba4..d58985485 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativePackage.java
@@ -32,17 +32,17 @@ import org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage;
  * <!-- end-user-doc -->
  * <!-- begin-model-doc -->
  * The Package for an Imperative QVT transformation.
- *
+ * 
  * An Imperative QVT trabsformation is expected to be created by an autogenerator that observes the following run-time restrictions:
- *
+ * 
  * A mapping that my be re-invoked must have MappingCall.isInfinite set for every possible invocation.
- *
+ * 
  * A mapping that reads object slots before they are guaranteed to have been assigned must declare the slots property in a corresponding ImperativeArea.checkedProperties entry.
- *
+ * 
  * A mapping that assigns an object slot that any mapping may access before assignment is guaranteed must declare declare the slots property in a corresponding ImperativeArea.enforcedProperties entry.
- *
+ * 
  * All reads by Functions/Queries must be guaranteed to succeed; i.e. the invoking mapping must check readiness before calling the query.
- *
+ * 
  * All writes to multi-valued properties must be guaranteed to occur before any read of the property.
  * <!-- end-model-doc -->
  * @see org.eclipse.qvtd.pivot.qvtimperative.QVTimperativeFactory
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeTables.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeTables.java
index 61bf664b2..a60bcccff 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/QVTimperativeTables.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
  * <copyright>
- * 
- * Copyright (c) 2013, 2017 Willink Transformations and others.
+ *
+ * Copyright (c) 2013, 2018 Willink Transformations 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:
  *   E.D.Willink - Initial API and implementation
- * 
+ *
  * </copyright>
  *************************************************************************
  * This code is 100% auto-generated
@@ -49,7 +49,6 @@ import org.eclipse.qvtd.pivot.qvtimperative.QVTimperativeTables;
  * In order to ensure correct static initialization, a top level class element must be accessed
  * before any nested class element. Therefore an access to PACKAGE.getClass() is recommended.
  */
-@SuppressWarnings("nls")
 public class QVTimperativeTables
 {
 	static {
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java
index 22a871cc3..21b873731 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/QVTimperativePackageImpl.java
@@ -306,13 +306,12 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 
 		// Register package validator
 		EValidator.Registry.INSTANCE.put
-		(theQVTimperativePackage,
-			new EValidator.Descriptor() {
-			@Override
-			public EValidator getEValidator() {
-				return QVTimperativeValidator.INSTANCE;
-			}
-		});
+			(theQVTimperativePackage,
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return QVTimperativeValidator.INSTANCE;
+				 }
+			 });
 
 		// Mark meta-data to indicate it can't be changed
 		theQVTimperativePackage.freeze();
@@ -1889,10 +1888,10 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	protected void createEcoreAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore";
 		addAnnotation
-		(this,
-			source,
-			new String[] {
-		});
+		  (this,
+		   source,
+		   new String[] {
+		   });
 	}
 
 	/**
@@ -1904,149 +1903,149 @@ public class QVTimperativePackageImpl extends EPackageImpl implements QVTimperat
 	protected void createUMLAnnotations() {
 		String source = "http://www.eclipse.org/uml2/2.0.0/UML";
 		addAnnotation
-		(getAddStatement__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForValue"
-		});
+		  (getAddStatement__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForValue"
+		   });
 		addAnnotation
-		(getBufferStatement__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForValue"
-		});
+		  (getBufferStatement__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForValue"
+		   });
 		addAnnotation
-		(getCheckStatement__ValidateTypeIsBoolean__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "TypeIsBoolean"
-		});
+		  (getCheckStatement__ValidateTypeIsBoolean__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "TypeIsBoolean"
+		   });
 		addAnnotation
-		(getDeclareStatement__ValidateCompatibleTypeForCheckedValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForCheckedValue"
-		});
+		  (getDeclareStatement__ValidateCompatibleTypeForCheckedValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForCheckedValue"
+		   });
 		addAnnotation
-		(getDeclareStatement__ValidateCompatibleTypeForUncheckedValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForUncheckedValue"
-		});
+		  (getDeclareStatement__ValidateCompatibleTypeForUncheckedValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForUncheckedValue"
+		   });
 		addAnnotation
-		(getImperativeTransformation__ValidateallRulesAreMappings__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "allRulesAreMappings"
-		});
+		  (getImperativeTransformation__ValidateallRulesAreMappings__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "allRulesAreMappings"
+		   });
 		addAnnotation
-		(getImperativeTypedModel__ValidateNameIsNotNull__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NameIsNotNull"
-		});
+		  (getImperativeTypedModel__ValidateNameIsNotNull__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NameIsNotNull"
+		   });
 		addAnnotation
-		(getImperativeTypedModel__ValidateNotBothCheckedAndEnforced__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NotBothCheckedAndEnforced"
-		});
+		  (getImperativeTypedModel__ValidateNotBothCheckedAndEnforced__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NotBothCheckedAndEnforced"
+		   });
 		addAnnotation
-		(getMapping__ValidateNameIsNotNull__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NameIsNotNull"
-		});
+		  (getMapping__ValidateNameIsNotNull__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NameIsNotNull"
+		   });
 		addAnnotation
-		(getMapping__ValidateMappingParameterNamesAreUnique__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "MappingParameterNamesAreUnique"
-		});
+		  (getMapping__ValidateMappingParameterNamesAreUnique__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "MappingParameterNamesAreUnique"
+		   });
 		addAnnotation
-		(getMapping__ValidateLocalVariableNamesAreUnique__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "LocalVariableNamesAreUnique"
-		});
+		  (getMapping__ValidateLocalVariableNamesAreUnique__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "LocalVariableNamesAreUnique"
+		   });
 		addAnnotation
-		(getMappingCall__ValidateMatchingCallBindings__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "MatchingCallBindings"
-		});
+		  (getMappingCall__ValidateMatchingCallBindings__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "MatchingCallBindings"
+		   });
 		addAnnotation
-		(getMappingCall__ValidateNotBothInstallAndInvoke__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NotBothInstallAndInvoke"
-		});
+		  (getMappingCall__ValidateNotBothInstallAndInvoke__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NotBothInstallAndInvoke"
+		   });
 		addAnnotation
-		(getMappingCall__ValidateUniqueCallBindings__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "UniqueCallBindings"
-		});
+		  (getMappingCall__ValidateUniqueCallBindings__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "UniqueCallBindings"
+		   });
 		addAnnotation
-		(getMappingParameterBinding__ValidateParameterIsMappingParameter__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "ParameterIsMappingParameter"
-		});
+		  (getMappingParameterBinding__ValidateParameterIsMappingParameter__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "ParameterIsMappingParameter"
+		   });
 		addAnnotation
-		(getNewStatement__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForValue"
-		});
+		  (getNewStatement__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForValue"
+		   });
 		addAnnotation
-		(getNewStatement__ValidateNonDataTypeForType__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NonDataTypeForType"
-		});
+		  (getNewStatement__ValidateNonDataTypeForType__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NonDataTypeForType"
+		   });
 		addAnnotation
-		(getSetStatement__ValidateCompatibleClassForProperty__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleClassForProperty"
-		});
+		  (getSetStatement__ValidateCompatibleClassForProperty__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleClassForProperty"
+		   });
 		addAnnotation
-		(getSetStatement__ValidateCompatibleTypeForPartialValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForPartialValue"
-		});
+		  (getSetStatement__ValidateCompatibleTypeForPartialValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForPartialValue"
+		   });
 		addAnnotation
-		(getSetStatement__ValidateCompatibleTypeForTotalValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForTotalValue"
-		});
+		  (getSetStatement__ValidateCompatibleTypeForTotalValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForTotalValue"
+		   });
 		addAnnotation
-		(getSetStatement__ValidateValueDoesNotNavigateFromRealizedVariables__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "ValueDoesNotNavigateFromRealizedVariables"
-		});
+		  (getSetStatement__ValidateValueDoesNotNavigateFromRealizedVariables__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "ValueDoesNotNavigateFromRealizedVariables"
+		   });
 		addAnnotation
-		(getSetStatement__ValidateTargetPropertyIsNotReadOnly__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "TargetPropertyIsNotReadOnly"
-		});
+		  (getSetStatement__ValidateTargetPropertyIsNotReadOnly__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "TargetPropertyIsNotReadOnly"
+		   });
 		addAnnotation
-		(getSimpleParameterBinding__ValidateCompatibleTypeForCheckedValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForCheckedValue"
-		});
+		  (getSimpleParameterBinding__ValidateCompatibleTypeForCheckedValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForCheckedValue"
+		   });
 		addAnnotation
-		(getSimpleParameterBinding__ValidateCompatibleTypeForUncheckedValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForUncheckedValue"
-		});
+		  (getSimpleParameterBinding__ValidateCompatibleTypeForUncheckedValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForUncheckedValue"
+		   });
 	}
 
 } //QVTimperativePackageImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SetStatementImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SetStatementImpl.java
index 6162b9503..f594ecdd3 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SetStatementImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/impl/SetStatementImpl.java
@@ -775,7 +775,7 @@ public class SetStatementImpl extends ObservableStatementImpl implements SetStat
 					 */
 					@Override
 					public @Nullable Object evaluate(final @NonNull Executor executor, final @NonNull TypeId typeId, final @Nullable Object oclAsSet, final /*@NonInvalid*/ java.lang.@Nullable Object e_0) {
-						final /*@NonInvalid*/ java.lang.@Nullable Object symbol_0 = e_0;
+						final /*@NonInvalid*/ java.lang.@Nullable Object symbol_0 = (Object)e_0;
 						final /*@Thrown*/ org.eclipse.ocl.pivot.values.@NonNull SetValue oclContents = ClassifierOclContentsOperation.INSTANCE.evaluate(executor, QVTimperativeTables.SET_CLSSid_OclElement, symbol_0);
 						return oclContents;
 					}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java
index 3a325759f..52e7dfdfa 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/AbstractQVTimperativeAS2XMIidVisitor.java
@@ -30,10 +30,9 @@ import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbaseAS2XMIidVisitor;
  * until a non-interface super-class is found). In the absence of any
  * suitable first super class, the method delegates to visiting().
  */
-@SuppressWarnings("deprecation")
 public abstract class AbstractQVTimperativeAS2XMIidVisitor
-extends QVTbaseAS2XMIidVisitor
-implements QVTimperativeVisitor<Boolean>
+	extends QVTbaseAS2XMIidVisitor
+	implements QVTimperativeVisitor<Boolean>
 {
 	/**
 	 * Initializes me with an initial value for my result.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeValidator.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeValidator.java
index b35ae283c..28635a108 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeValidator.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/emf-gen/org/eclipse/qvtd/pivot/qvtimperative/util/QVTimperativeValidator.java
@@ -321,7 +321,7 @@ public class QVTimperativeValidator extends EObjectValidator {
 	 */
 	@Override
 	protected EPackage getEPackage() {
-		return QVTimperativePackage.eINSTANCE;
+	  return QVTimperativePackage.eINSTANCE;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore
index 3fa1265f7..3ce0ea0db 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.ecore
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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" xmi:id="P-qvtimperative" name="qvtimperative" nsURI="http://www.eclipse.org/qvt/2016/QVTimperative"
-    nsPrefix="qvti">
+<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"
+    xmi:id="P-qvtimperative" name="qvtimperative" nsURI="http://www.eclipse.org/qvt/2016/QVTimperative" nsPrefix="qvti">
   <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
     <details key="documentation" value="The Package for an Imperative QVT transformation.&#xA;&#xA;An Imperative QVT trabsformation is expected to be created by an autogenerator that observes the following run-time restrictions:&#xA;&#xA;A mapping that my be re-invoked must have MappingCall.isInfinite set for every possible invocation.&#xA;&#xA;A mapping that reads object slots before they are guaranteed to have been assigned must declare the slots property in a corresponding ImperativeArea.checkedProperties entry.&#xA;&#xA;A mapping that assigns an object slot that any mapping may access before assignment is guaranteed must declare declare the slots property in a corresponding ImperativeArea.enforcedProperties entry.&#xA;&#xA;All reads by Functions/Queries must be guaranteed to succeed; i.e. the invoking mapping must check readiness before calling the query.&#xA;&#xA;All writes to multi-valued properties must be guaranteed to occur before any read of the property."/>
   </eAnnotations>
@@ -13,8 +12,7 @@
     <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
     <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
   </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-AddStatement" name="AddStatement"
-      eSuperTypes="#T-qvtimperative-MappingStatement #T-qvtimperative-ObservableStatement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-AddStatement" name="AddStatement" eSuperTypes="#T-qvtimperative-MappingStatement #T-qvtimperative-ObservableStatement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An AddStatement appends the value of an expression to a connection.&#xA;&#xA;syntax: oclText[add connection := expression;]"/>
     </eAnnotations>
@@ -33,46 +31,42 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-AddStatement-targetVariable"
-        name="targetVariable" lowerBound="1" eType="#T-qvtimperative-ConnectionVariable">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-AddStatement-targetVariable" name="targetVariable" lowerBound="1"
+        eType="#T-qvtimperative-ConnectionVariable">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The connection to be appended."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-AddStatement-isEnforcedUnique"
-        name="isEnforcedUnique" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-AddStatement-isEnforcedUnique" name="isEnforcedUnique" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="True if the append is suppressed after a check for uniqueness of the value."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-AddStatement-ownedExpression"
-        name="ownedExpression" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-AddStatement-ownedExpression" name="ownedExpression" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The expression whose evaluation yields the value to append."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-AppendParameter" name="AppendParameter"
-      eSuperTypes="#T-qvtimperative-ConnectionVariable #T-qvtimperative-MappingParameter">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-AppendParameter" name="AppendParameter" eSuperTypes="#T-qvtimperative-ConnectionVariable #T-qvtimperative-MappingParameter">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An AppendParameter of a Mapping defines an output connection to which values may be appended.&#xA;&#xA;syntax: oclText[append name : type;]"/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-AppendParameterBinding"
-      name="AppendParameterBinding" eSuperTypes="#T-qvtimperative-MappingParameterBinding">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-AppendParameterBinding" name="AppendParameterBinding" eSuperTypes="#T-qvtimperative-MappingParameterBinding">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An AppendParameterBinding binds an AppendParameter of an invoked Mapping to a connection of the invoker.&#xA;Execution of the mapping may append to the connection.&#xA;&#xA;syntax: oclText[formalName appendsTo connection;]"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-AppendParameterBinding-value"
-        name="value" lowerBound="1" eType="#T-qvtimperative-ConnectionVariable">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-AppendParameterBinding-value" name="value" lowerBound="1"
+        eType="#T-qvtimperative-ConnectionVariable">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The value or collection of values to bind to boundVariable"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-BufferStatement" name="BufferStatement"
-      eSuperTypes="#T-qvtimperative-ConnectionVariable #T-qvtimperative-VariableStatement #T-qvtimperative-ObservableStatement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-BufferStatement" name="BufferStatement" eSuperTypes="#T-qvtimperative-ConnectionVariable #T-qvtimperative-VariableStatement #T-qvtimperative-ObservableStatement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A BufferStatement declares a connection buffer and optionally assigns initial content.&#xA;&#xA;syntax: oclText[buffer name : type := expression;]&#xA;&#xA;oclText[type] or oclText[expression] but not both may be omitted. An omitted type is deduced from the initial expression values."/>
     </eAnnotations>
@@ -91,16 +85,14 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-BufferStatement-ownedExpression"
-        name="ownedExpression" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-BufferStatement-ownedExpression" name="ownedExpression" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
         containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The optional expression computing initial content values."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-CheckStatement" name="CheckStatement"
-      eSuperTypes="#T-qvtimperative-ObservableStatement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-CheckStatement" name="CheckStatement" eSuperTypes="#T-qvtimperative-ObservableStatement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A CheckStatement evaluates a predicate. If the evaluation is false, the mapping execution&#xA;terminates fails and does nothing.&#xA;&#xA;syntax: oclText[check expression;]"/>
     </eAnnotations>
@@ -119,25 +111,21 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-CheckStatement-ownedExpression"
-        name="ownedExpression" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-CheckStatement-ownedExpression" name="ownedExpression" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ConnectionVariable"
-      name="ConnectionVariable" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ConnectionVariable" name="ConnectionVariable" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A ConnectionVariable identifes a variable used as a connection buffer."/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-ConnectionVariable-isStrict"
-        name="isStrict" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-ConnectionVariable-isStrict" name="isStrict" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Duplicate elements in a strict ConnectionVariable are suppressed at run-time.&#xD;&#xA;&#xD;&#xA;Duplicate elements in a not-strict ConnectionVariable are guaranteed not to occur."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-DeclareStatement"
-      name="DeclareStatement" eSuperTypes="#T-qvtimperative-VariableStatement #T-qvtimperative-ObservableStatement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-DeclareStatement" name="DeclareStatement" eSuperTypes="#T-qvtimperative-VariableStatement #T-qvtimperative-ObservableStatement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A DeclareStatement declares a variable and initial value.&#xA;&#xA;syntax: oclText[check var name : type := expression;]&#xA;&#xA;oclText[type] or oclText[expression] but not both may be omitted. An omitted type is deduced from the initial expression values.&#xA;&#xA;oclText[check] may be omitted when the expression type is necessarily conformant."/>
     </eAnnotations>
@@ -171,66 +159,58 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-DeclareStatement-isCheck"
-        name="isCheck" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-DeclareStatement-isCheck" name="isCheck" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="True if the initial expression's type must be  checked for conformance with the variable's type.&#xA;A non-conforming vlaue is a predicate failure causing the mapping to fail without doing anything.&#xA;This is a derivation of not ownedInit.type.conformsTo(self.type)."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-DeclareStatement-ownedExpression"
-        name="ownedExpression" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-DeclareStatement-ownedExpression" name="ownedExpression"
+        lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The expression computing the variable's value."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-GuardParameter" name="GuardParameter"
-      eSuperTypes="#T-qvtimperative-MappingParameter">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-GuardParameter" name="GuardParameter" eSuperTypes="#T-qvtimperative-MappingParameter">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A GuardParameter of a Mapping defines a input at which a value is consumed from a connection.&#xA;&#xA;syntax: oclText[guard:typedModel name : type;]"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-GuardParameter-referredTypedModel"
-        name="referredTypedModel" lowerBound="1" eType="#T-qvtimperative-ImperativeTypedModel">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-GuardParameter-referredTypedModel" name="referredTypedModel"
+        lowerBound="1" eType="#T-qvtimperative-ImperativeTypedModel">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The TypedModel that contains the passed value."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-GuardParameter-successProperty"
-        name="successProperty" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-GuardParameter-successProperty" name="successProperty" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The TypedModel that contains the passed value."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-GuardParameterBinding"
-      name="GuardParameterBinding" eSuperTypes="#T-qvtimperative-MappingParameterBinding">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-GuardParameterBinding" name="GuardParameterBinding" eSuperTypes="#T-qvtimperative-MappingParameterBinding">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A GuardParameterBinding binds a guard parameter of an invoked Mapping to a value of a connection.&#xA;Execution of the mapping may use the value. A distinct Mapping invocation occurs for each value&#xA;in the connection.&#xA;&#xA;syntax: oclText[formalName consumes expression;]"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-GuardParameterBinding-value"
-        name="value" lowerBound="1" eType="#T-qvtimperative-ConnectionVariable">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-GuardParameterBinding-value" name="value" lowerBound="1"
+        eType="#T-qvtimperative-ConnectionVariable">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The connection providing the invocation values."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-GuardParameterBinding-isCheck"
-        name="isCheck" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-GuardParameterBinding-isCheck" name="isCheck" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="True if each consumed value must be checked for conformance with the variable's type.&#xA;A non-conforming vlaue is a predicate failure causing the mapping invocation to fail without doing anything.&#xA;This is a derivation of not ownedInit.type.conformsTo(self.type)."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ImperativeModel" name="ImperativeModel"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-BaseModel">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ImperativeModel" name="ImperativeModel" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-BaseModel">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="The Model of an Imperative QVT transformation."/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ImperativeTransformation"
-      name="ImperativeTransformation" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Transformation">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ImperativeTransformation" name="ImperativeTransformation" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Transformation">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An ImperativeTransfornmation distinguishes a QVTi transformation from other transformations."/>
     </eAnnotations>
@@ -250,8 +230,7 @@
       </eParameters>
     </eOperations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ImperativeTypedModel"
-      name="ImperativeTypedModel" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-TypedModel">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ImperativeTypedModel" name="ImperativeTypedModel" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-TypedModel">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An ImperativeTypedModel defines an input,middle or output modek for the transformation."/>
     </eAnnotations>
@@ -285,58 +264,50 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-ImperativeTypedModel-isChecked"
-        name="isChecked" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-ImperativeTypedModel-isChecked" name="isChecked" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="True for an input model."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-ImperativeTypedModel-isEnforced"
-        name="isEnforced" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-ImperativeTypedModel-isEnforced" name="isEnforced" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="True for an output model."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-ImperativeTypedModel-allUsedPackages"
-        name="allUsedPackages" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Package"
-        changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-ImperativeTypedModel-allUsedPackages" name="allUsedPackages"
+        ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Package" changeable="false"
+        volatile="true" transient="true" derived="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="derivation" value="usedPackage&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-LoopParameterBinding"
-      name="LoopParameterBinding" eSuperTypes="#T-qvtimperative-MappingParameterBinding">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-LoopParameterBinding" name="LoopParameterBinding" eSuperTypes="#T-qvtimperative-MappingParameterBinding">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A LoopParameterBinding binds a guard parameter of an invoked Mapping to the value of a loop variable&#xA;in the invoker. Execution of the mapping may use the value.&#xA;&#xA;syntax: oclText[formalName iterates expression;]&#xA;&#xA;Deprecated - WIP for a consuming stream"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-LoopParameterBinding-value"
-        name="value" lowerBound="1" eType="#T-qvtimperative-LoopVariable">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-LoopParameterBinding-value" name="value" lowerBound="1" eType="#T-qvtimperative-LoopVariable">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The value or collection of values to bind to boundVariable"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-LoopParameterBinding-isCheck"
-        name="isCheck" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-LoopParameterBinding-isCheck" name="isCheck" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Whether the variable initialization needs to be checked as a predicate. This is a derivation of not ownedInit.type.conformsTo(self.type)."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-LoopVariable" name="LoopVariable"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-LoopVariable" name="LoopVariable" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A LoopVariable defines the iterator of a MappingLoop."/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-LoopVariable-owningMappingLoop"
-        name="owningMappingLoop" lowerBound="1" eType="#T-qvtimperative-MappingLoop"
-        eOpposite="#F-qvtimperative-MappingLoop-ownedIterators"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-LoopVariable-owningMappingLoop" name="owningMappingLoop"
+        lowerBound="1" eType="#T-qvtimperative-MappingLoop" eOpposite="#F-qvtimperative-MappingLoop-ownedIterators"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-Mapping" name="Mapping"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Rule">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-Mapping" name="Mapping" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Rule">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An Imperative Mapping extends the abstract declarative mapping to support&#xA;explicit nested invocation of mappings with bindings for the invoked mapping's&#xA;bound variables."/>
     </eAnnotations>
@@ -385,22 +356,18 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-Mapping-isStrict"
-        name="isStrict" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-Mapping-isStrict" name="isStrict" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Repeated invocations of a strict Mapping are suppressed at run-time.&#xD;&#xA;&#xD;&#xA;Repeated invocations of a not-strict Mapping are guaranteed not to occur."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-Mapping-ownedMappingParameters"
-        name="ownedMappingParameters" ordered="false" upperBound="-1" eType="#T-qvtimperative-MappingParameter"
-        containment="true" eOpposite="#F-qvtimperative-MappingParameter-owningMapping"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-Mapping-ownedStatements"
-        name="ownedStatements" upperBound="-1" eType="#T-qvtimperative-Statement"
-        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-Mapping-ownedMappingParameters" name="ownedMappingParameters"
+        ordered="false" upperBound="-1" eType="#T-qvtimperative-MappingParameter" containment="true" eOpposite="#F-qvtimperative-MappingParameter-owningMapping"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-Mapping-ownedStatements" name="ownedStatements" upperBound="-1"
+        eType="#T-qvtimperative-Statement" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingCall" name="MappingCall"
-      eSuperTypes="#T-qvtimperative-MappingStatement ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ReferringElement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingCall" name="MappingCall" eSuperTypes="#T-qvtimperative-MappingStatement ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ReferringElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A MappingCall specifies the invocation of a referredMapping with a set of bindings.&#xA;An installed mapping is invoked asynchronously whenever suitable values are available on consumed connections.&#xA;An invoked mapping is invoked synchronously with values provided by the caller."/>
     </eAnnotations>
@@ -449,89 +416,79 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingCall-ownedMappingParameterBindings"
-        name="ownedMappingParameterBindings" upperBound="-1" eType="#T-qvtimperative-MappingParameterBinding"
-        containment="true" eOpposite="#F-qvtimperative-MappingParameterBinding-owningMappingCall">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingCall-ownedMappingParameterBindings" name="ownedMappingParameterBindings"
+        upperBound="-1" eType="#T-qvtimperative-MappingParameterBinding" containment="true" eOpposite="#F-qvtimperative-MappingParameterBinding-owningMappingCall">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The Set of bindings of variables or expressions to forma parameters."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-MappingCall-isInstall"
-        name="isInstall" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-MappingCall-isInstall" name="isInstall" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="An install MappingCall declares a MappingCall that consumes one or more connections and appends to zero or more connections.&#xA;Invocations of the mapping are driven by the availability of values in the connection."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-MappingCall-isInvoke"
-        name="isInvoke" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-MappingCall-isInvoke" name="isInvoke" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="An invoke MappingCall invokes a Mapping that uses one or more values and appends to zero or more connections.&#xA;Invocations of the mapping is requested by the caller."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingCall-referredMapping"
-        name="referredMapping" lowerBound="1" eType="#T-qvtimperative-Mapping">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingCall-referredMapping" name="referredMapping" lowerBound="1"
+        eType="#T-qvtimperative-Mapping">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The Mapping invoked by the MappingCall."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-MappingCall-referredNames"
-        name="referredNames" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        changeable="false" volatile="true" transient="true" derived="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-MappingCall-referredNames" name="referredNames" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false" volatile="true" transient="true" derived="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="derivation" value="referredMapping.ownedMappingParameters.name->asSet()->sortedBy(n | n)&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-MappingCall-referringNames"
-        name="referringNames" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        changeable="false" volatile="true" transient="true" derived="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-MappingCall-referringNames" name="referringNames" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" changeable="false" volatile="true" transient="true" derived="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="derivation" value="ownedMappingParameterBindings.boundVariable.name->asSet()->sortedBy(n | n)&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingLoop" name="MappingLoop"
-      eSuperTypes="#T-qvtimperative-MappingStatement #T-qvtimperative-ObservableStatement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingLoop" name="MappingLoop" eSuperTypes="#T-qvtimperative-MappingStatement #T-qvtimperative-ObservableStatement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A MappingLoop supports an iteration of mapping invocations.&#xA;&#xA;syntax: oclText[for name : type in expression {...}]"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingLoop-ownedIterators"
-        name="ownedIterators" upperBound="-1" eType="#T-qvtimperative-LoopVariable"
-        containment="true" eOpposite="#F-qvtimperative-LoopVariable-owningMappingLoop">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingLoop-ownedIterators" name="ownedIterators" upperBound="-1"
+        eType="#T-qvtimperative-LoopVariable" containment="true" eOpposite="#F-qvtimperative-LoopVariable-owningMappingLoop">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The iterator loop variable."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingLoop-ownedMappingStatements"
-        name="ownedMappingStatements" upperBound="-1" eType="#T-qvtimperative-MappingStatement"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingLoop-ownedMappingStatements" name="ownedMappingStatements"
+        upperBound="-1" eType="#T-qvtimperative-MappingStatement" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The statements to be iterated, typically a single MappingCall."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingLoop-ownedExpression"
-        name="ownedExpression" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingLoop-ownedExpression" name="ownedExpression" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The expression whose values provide the iterator values."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingParameter"
-      name="MappingParameter" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingParameter" name="MappingParameter" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A MappingParameter defines a formal parameter of a mapping. The parameter is bound by the&#xA;mapping invocation to satisfy the requirements of the derived parameter class."/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingParameter-owningMapping"
-        name="owningMapping" lowerBound="1" eType="#T-qvtimperative-Mapping" eOpposite="#F-qvtimperative-Mapping-ownedMappingParameters">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingParameter-owningMapping" name="owningMapping" lowerBound="1"
+        eType="#T-qvtimperative-Mapping" eOpposite="#F-qvtimperative-Mapping-ownedMappingParameters">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The containing MappingCall."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingParameterBinding"
-      name="MappingParameterBinding" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingParameterBinding" name="MappingParameterBinding" abstract="true"
+      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A MappingCallBinding specifies the binding of a single variable or value to&#xA;the formal parameter of a mapping as part of its inviocatuon or installation."/>
     </eAnnotations>
@@ -550,28 +507,25 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingParameterBinding-owningMappingCall"
-        name="owningMappingCall" lowerBound="1" eType="#T-qvtimperative-MappingCall"
-        eOpposite="#F-qvtimperative-MappingCall-ownedMappingParameterBindings">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingParameterBinding-owningMappingCall" name="owningMappingCall"
+        lowerBound="1" eType="#T-qvtimperative-MappingCall" eOpposite="#F-qvtimperative-MappingCall-ownedMappingParameterBindings">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The containing MappingCall."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingParameterBinding-boundVariable"
-        name="boundVariable" lowerBound="1" eType="#T-qvtimperative-MappingParameter">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-MappingParameterBinding-boundVariable" name="boundVariable"
+        lowerBound="1" eType="#T-qvtimperative-MappingParameter">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The formal parameter bound by the call."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingStatement"
-      name="MappingStatement" abstract="true" eSuperTypes="#T-qvtimperative-Statement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-MappingStatement" name="MappingStatement" abstract="true" eSuperTypes="#T-qvtimperative-Statement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A MappingCall specifies the invocation of a referredMapping with a set of bindings&#xA;of the bound variables of the referredMapping to values provided in the invocation.&#xA;Where Collections of values are provided for isLoop bindings, a distinct invocation&#xA;is performed for each distinct permutation of Collection elements."/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-NewStatement" name="NewStatement"
-      eSuperTypes="#T-qvtimperative-VariableStatement #T-qvtimperative-ObservableStatement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-NewStatement" name="NewStatement" eSuperTypes="#T-qvtimperative-VariableStatement #T-qvtimperative-ObservableStatement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A NewStatement creates an instance of a class and binds a name to it.&#xA;&#xA;syntax: oclText[new:typedModel name : type := expression;]&#xA;&#xA;If expression is omitted, a new instance if the tyope is created. If expression is provided, it&#xA;computes the 'new' object, typically a singlton supervisor fpr a QVTr key."/>
     </eAnnotations>
@@ -605,40 +559,37 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-NewStatement-isContained"
-        name="isContained" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-NewStatement-isContained" name="isContained" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="True if the new element is guaranteed to be assigned to a container and so does not need to be tracked in the set of potential orphan elememnts to be contained at the model root."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-NewStatement-referredTypedModel"
-        name="referredTypedModel" lowerBound="1" eType="#T-qvtimperative-ImperativeTypedModel">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-NewStatement-referredTypedModel" name="referredTypedModel"
+        lowerBound="1" eType="#T-qvtimperative-ImperativeTypedModel">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The TypedModel to which the new object is added."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-NewStatement-ownedExpression"
-        name="ownedExpression" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-NewStatement-ownedExpression" name="ownedExpression" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
         containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Optional expression that constructs the new object."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ObservableStatement"
-      name="ObservableStatement" abstract="true" eSuperTypes="#T-qvtimperative-Statement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-ObservableStatement" name="ObservableStatement" abstract="true" eSuperTypes="#T-qvtimperative-Statement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="An ObservableStatement may involve evaluation of an expression that accesses object properties whose&#xA;values may not be available. If not ready,the mapping execution is suspended until the required value&#xA;is made available by a notifying SetStatement.&#xA;&#xA;syntax: oclText[observe class::property ...]"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-ObservableStatement-observedProperties"
-        name="observedProperties" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-ObservableStatement-observedProperties" name="observedProperties"
+        ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The properties whose accesses must be checked for readiness."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-SetStatement" name="SetStatement"
-      eSuperTypes="#T-qvtimperative-ObservableStatement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-SetStatement" name="SetStatement" eSuperTypes="#T-qvtimperative-ObservableStatement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A SetStatement sets an object property to a computed value.&#xA;&#xA;syntax: oclText[notify set name : type := expression;]&#xA;&#xA;If oclText[notify] is specified, execution defines the property as ready enabling&#xA;mappings whose ObservableStatements are waiting for the value to resume."/>
     </eAnnotations>
@@ -717,48 +668,42 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SetStatement-targetVariable"
-        name="targetVariable" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SetStatement-targetProperty"
-        name="targetProperty" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-SetStatement-isPartial"
-        name="isPartial" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SetStatement-targetVariable" name="targetVariable" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SetStatement-targetProperty" name="targetProperty" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-SetStatement-isPartial" name="isPartial" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="If not isPartial, the value of the ownedExpression is assigned as the entirety of the targetProperty of the targetVariable.&#xD;&#xA;&#xD;&#xA;If isPartial, the value of the ownedExpression is included within the targetProperty of the targetVariable."/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-SetStatement-isNotify"
-        name="isNotify" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-SetStatement-isNotify" name="isNotify" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-SetStatement-isOpposite"
-        name="isOpposite" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SetStatement-ownedExpression"
-        name="ownedExpression" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SetStatement-resolvedProperty"
-        name="resolvedProperty" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property"
-        changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-SetStatement-isOpposite" name="isOpposite" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SetStatement-ownedExpression" name="ownedExpression" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SetStatement-resolvedProperty" name="resolvedProperty" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property" changeable="false" volatile="true" transient="true"
+        derived="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="derivation" value="if isOpposite then targetProperty.opposite else targetProperty endif&#xA;&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-SimpleParameter" name="SimpleParameter"
-      eSuperTypes="#T-qvtimperative-MappingParameter">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-SimpleParameter" name="SimpleParameter" eSuperTypes="#T-qvtimperative-MappingParameter">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A SimpleParameter of a Mapping defines an input at which a value is passed to the mapping.&#xA;&#xA;syntax: oclText[in:typedModel name : type;]"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SimpleParameter-referredTypedModel"
-        name="referredTypedModel" lowerBound="1" eType="#T-qvtimperative-ImperativeTypedModel">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SimpleParameter-referredTypedModel" name="referredTypedModel"
+        lowerBound="1" eType="#T-qvtimperative-ImperativeTypedModel">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The TypedModel that contains the passed value."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-SimpleParameterBinding"
-      name="SimpleParameterBinding" eSuperTypes="#T-qvtimperative-MappingParameterBinding">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-SimpleParameterBinding" name="SimpleParameterBinding" eSuperTypes="#T-qvtimperative-MappingParameterBinding">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A SimpleParameterBinding binds a simple parameter of an invoked Mapping to the value of an expression&#xA;computed by the invoker. Execution of the mapping may use the value.&#xA;&#xA;syntax: oclText[formalName uses expression;]"/>
     </eAnnotations>
@@ -792,23 +737,20 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SimpleParameterBinding-value"
-        name="value" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtimperative-SimpleParameterBinding-value" name="value" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="The value or collection of values to bind to boundVariable"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-SimpleParameterBinding-isCheck"
-        name="isCheck" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtimperative-SimpleParameterBinding-isCheck" name="isCheck" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="Whether the variable initialization needs to be checked as a predicate. This is a derivation of not ownedInit.type.conformsTo(self.type)."/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-Statement" name="Statement"
-      abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-NamedElement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-Statement" name="Statement" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-NamedElement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A Statement is the basis for all execution by a Mapping."/>
     </eAnnotations>
@@ -819,8 +761,7 @@
       <eParameters name="names" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eOperations>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-VariableStatement"
-      name="VariableStatement" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration #T-qvtimperative-Statement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtimperative-VariableStatement" name="VariableStatement" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-VariableDeclaration #T-qvtimperative-Statement">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="A VariableStatement is the basis for a Mapping execution that makes a name available to subsequent starements."/>
     </eAnnotations>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.genmodel b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.genmodel
index 9eb6ab835..9adccd299 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.genmodel
+++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2017 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.qvtd.pivot.qvtimperative/emf-gen" modelPluginID="org.eclipse.qvtd.pivot.qvtimperative"
     modelName="QVTimperative" suppressEMFModelTags="true" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.7" usedGenPackages="../../org.eclipse.ocl.pivot/model/Pivot.genmodel#//pivot ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel#//qvtbase"
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationTables.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationTables.java
index bbbafae84..5c2030e2f 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/QVTrelationTables.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * <copyright>
  *
- * Copyright (c) 2013, 2017 Willink Transformations and others.
+ * Copyright (c) 2013, 2018 Willink Transformations 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
@@ -435,148 +435,148 @@ public class QVTrelationTables
 		}
 
 		private static final @NonNull ExecutorFragment @NonNull [] _DomainPattern =
-			{
-				Fragments._DomainPattern__OclAny /* 0 */,
-				Fragments._DomainPattern__OclElement /* 1 */,
-				Fragments._DomainPattern__Visitable /* 2 */,
-				Fragments._DomainPattern__Element /* 3 */,
-				Fragments._DomainPattern__Pattern /* 4 */,
-				Fragments._DomainPattern__DomainPattern /* 5 */
-			};
+		{
+			Fragments._DomainPattern__OclAny /* 0 */,
+			Fragments._DomainPattern__OclElement /* 1 */,
+			Fragments._DomainPattern__Visitable /* 2 */,
+			Fragments._DomainPattern__Element /* 3 */,
+			Fragments._DomainPattern__Pattern /* 4 */,
+			Fragments._DomainPattern__DomainPattern /* 5 */
+		};
 		private static final int @NonNull [] __DomainPattern = { 1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Key =
-			{
-				Fragments._Key__OclAny /* 0 */,
-				Fragments._Key__OclElement /* 1 */,
-				Fragments._Key__Visitable /* 2 */,
-				Fragments._Key__Element /* 3 */,
-				Fragments._Key__Key /* 4 */
-			};
+		{
+			Fragments._Key__OclAny /* 0 */,
+			Fragments._Key__OclElement /* 1 */,
+			Fragments._Key__Visitable /* 2 */,
+			Fragments._Key__Element /* 3 */,
+			Fragments._Key__Key /* 4 */
+		};
 		private static final int @NonNull [] __Key = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Relation =
-			{
-				Fragments._Relation__OclAny /* 0 */,
-				Fragments._Relation__OclElement /* 1 */,
-				Fragments._Relation__Nameable /* 2 */,
-				Fragments._Relation__Visitable /* 2 */,
-				Fragments._Relation__Element /* 3 */,
-				Fragments._Relation__NamedElement /* 4 */,
-				Fragments._Relation__Rule /* 5 */,
-				Fragments._Relation__Relation /* 6 */
-			};
+		{
+			Fragments._Relation__OclAny /* 0 */,
+			Fragments._Relation__OclElement /* 1 */,
+			Fragments._Relation__Nameable /* 2 */,
+			Fragments._Relation__Visitable /* 2 */,
+			Fragments._Relation__Element /* 3 */,
+			Fragments._Relation__NamedElement /* 4 */,
+			Fragments._Relation__Rule /* 5 */,
+			Fragments._Relation__Relation /* 6 */
+		};
 		private static final int @NonNull [] __Relation = { 1,1,2,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _RelationCallExp =
-			{
-				Fragments._RelationCallExp__OclAny /* 0 */,
-				Fragments._RelationCallExp__OclElement /* 1 */,
-				Fragments._RelationCallExp__Nameable /* 2 */,
-				Fragments._RelationCallExp__Visitable /* 2 */,
-				Fragments._RelationCallExp__Element /* 3 */,
-				Fragments._RelationCallExp__NamedElement /* 4 */,
-				Fragments._RelationCallExp__TypedElement /* 5 */,
-				Fragments._RelationCallExp__OCLExpression /* 6 */,
-				Fragments._RelationCallExp__RelationCallExp /* 7 */
-			};
+		{
+			Fragments._RelationCallExp__OclAny /* 0 */,
+			Fragments._RelationCallExp__OclElement /* 1 */,
+			Fragments._RelationCallExp__Nameable /* 2 */,
+			Fragments._RelationCallExp__Visitable /* 2 */,
+			Fragments._RelationCallExp__Element /* 3 */,
+			Fragments._RelationCallExp__NamedElement /* 4 */,
+			Fragments._RelationCallExp__TypedElement /* 5 */,
+			Fragments._RelationCallExp__OCLExpression /* 6 */,
+			Fragments._RelationCallExp__RelationCallExp /* 7 */
+		};
 		private static final int @NonNull [] __RelationCallExp = { 1,1,2,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _RelationDomain =
-			{
-				Fragments._RelationDomain__OclAny /* 0 */,
-				Fragments._RelationDomain__OclElement /* 1 */,
-				Fragments._RelationDomain__Nameable /* 2 */,
-				Fragments._RelationDomain__ReferringElement /* 2 */,
-				Fragments._RelationDomain__Visitable /* 2 */,
-				Fragments._RelationDomain__Element /* 3 */,
-				Fragments._RelationDomain__NamedElement /* 4 */,
-				Fragments._RelationDomain__Domain /* 5 */,
-				Fragments._RelationDomain__RelationDomain /* 6 */
-			};
+		{
+			Fragments._RelationDomain__OclAny /* 0 */,
+			Fragments._RelationDomain__OclElement /* 1 */,
+			Fragments._RelationDomain__Nameable /* 2 */,
+			Fragments._RelationDomain__ReferringElement /* 2 */,
+			Fragments._RelationDomain__Visitable /* 2 */,
+			Fragments._RelationDomain__Element /* 3 */,
+			Fragments._RelationDomain__NamedElement /* 4 */,
+			Fragments._RelationDomain__Domain /* 5 */,
+			Fragments._RelationDomain__RelationDomain /* 6 */
+		};
 		private static final int @NonNull [] __RelationDomain = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _RelationDomainAssignment =
-			{
-				Fragments._RelationDomainAssignment__OclAny /* 0 */,
-				Fragments._RelationDomainAssignment__OclElement /* 1 */,
-				Fragments._RelationDomainAssignment__Visitable /* 2 */,
-				Fragments._RelationDomainAssignment__Element /* 3 */,
-				Fragments._RelationDomainAssignment__RelationDomainAssignment /* 4 */
-			};
+		{
+			Fragments._RelationDomainAssignment__OclAny /* 0 */,
+			Fragments._RelationDomainAssignment__OclElement /* 1 */,
+			Fragments._RelationDomainAssignment__Visitable /* 2 */,
+			Fragments._RelationDomainAssignment__Element /* 3 */,
+			Fragments._RelationDomainAssignment__RelationDomainAssignment /* 4 */
+		};
 		private static final int @NonNull [] __RelationDomainAssignment = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _RelationImplementation =
-			{
-				Fragments._RelationImplementation__OclAny /* 0 */,
-				Fragments._RelationImplementation__OclElement /* 1 */,
-				Fragments._RelationImplementation__Visitable /* 2 */,
-				Fragments._RelationImplementation__Element /* 3 */,
-				Fragments._RelationImplementation__RelationImplementation /* 4 */
-			};
+		{
+			Fragments._RelationImplementation__OclAny /* 0 */,
+			Fragments._RelationImplementation__OclElement /* 1 */,
+			Fragments._RelationImplementation__Visitable /* 2 */,
+			Fragments._RelationImplementation__Element /* 3 */,
+			Fragments._RelationImplementation__RelationImplementation /* 4 */
+		};
 		private static final int @NonNull [] __RelationImplementation = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _RelationModel =
-			{
-				Fragments._RelationModel__OclAny /* 0 */,
-				Fragments._RelationModel__OclElement /* 1 */,
-				Fragments._RelationModel__Nameable /* 2 */,
-				Fragments._RelationModel__Visitable /* 2 */,
-				Fragments._RelationModel__Element /* 3 */,
-				Fragments._RelationModel__NamedElement /* 4 */,
-				Fragments._RelationModel__Namespace /* 5 */,
-				Fragments._RelationModel__Model /* 6 */,
-				Fragments._RelationModel__BaseModel /* 7 */,
-				Fragments._RelationModel__RelationModel /* 8 */
-			};
+		{
+			Fragments._RelationModel__OclAny /* 0 */,
+			Fragments._RelationModel__OclElement /* 1 */,
+			Fragments._RelationModel__Nameable /* 2 */,
+			Fragments._RelationModel__Visitable /* 2 */,
+			Fragments._RelationModel__Element /* 3 */,
+			Fragments._RelationModel__NamedElement /* 4 */,
+			Fragments._RelationModel__Namespace /* 5 */,
+			Fragments._RelationModel__Model /* 6 */,
+			Fragments._RelationModel__BaseModel /* 7 */,
+			Fragments._RelationModel__RelationModel /* 8 */
+		};
 		private static final int @NonNull [] __RelationModel = { 1,1,2,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _RelationalTransformation =
-			{
-				Fragments._RelationalTransformation__OclAny /* 0 */,
-				Fragments._RelationalTransformation__OclElement /* 1 */,
-				Fragments._RelationalTransformation__Nameable /* 2 */,
-				Fragments._RelationalTransformation__OclType /* 2 */,
-				Fragments._RelationalTransformation__Visitable /* 2 */,
-				Fragments._RelationalTransformation__Element /* 3 */,
-				Fragments._RelationalTransformation__NamedElement /* 4 */,
-				Fragments._RelationalTransformation__TemplateableElement /* 4 */,
-				Fragments._RelationalTransformation__Namespace /* 5 */,
-				Fragments._RelationalTransformation__Type /* 5 */,
-				Fragments._RelationalTransformation__Class /* 6 */,
-				Fragments._RelationalTransformation__Transformation /* 7 */,
-				Fragments._RelationalTransformation__RelationalTransformation /* 8 */
-			};
+		{
+			Fragments._RelationalTransformation__OclAny /* 0 */,
+			Fragments._RelationalTransformation__OclElement /* 1 */,
+			Fragments._RelationalTransformation__Nameable /* 2 */,
+			Fragments._RelationalTransformation__OclType /* 2 */,
+			Fragments._RelationalTransformation__Visitable /* 2 */,
+			Fragments._RelationalTransformation__Element /* 3 */,
+			Fragments._RelationalTransformation__NamedElement /* 4 */,
+			Fragments._RelationalTransformation__TemplateableElement /* 4 */,
+			Fragments._RelationalTransformation__Namespace /* 5 */,
+			Fragments._RelationalTransformation__Type /* 5 */,
+			Fragments._RelationalTransformation__Class /* 6 */,
+			Fragments._RelationalTransformation__Transformation /* 7 */,
+			Fragments._RelationalTransformation__RelationalTransformation /* 8 */
+		};
 		private static final int @NonNull [] __RelationalTransformation = { 1,1,3,1,2,2,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _SharedVariable =
-			{
-				Fragments._SharedVariable__OclAny /* 0 */,
-				Fragments._SharedVariable__OclElement /* 1 */,
-				Fragments._SharedVariable__Nameable /* 2 */,
-				Fragments._SharedVariable__Visitable /* 2 */,
-				Fragments._SharedVariable__Element /* 3 */,
-				Fragments._SharedVariable__NamedElement /* 4 */,
-				Fragments._SharedVariable__TypedElement /* 5 */,
-				Fragments._SharedVariable__VariableDeclaration /* 6 */,
-				Fragments._SharedVariable__Variable /* 7 */,
-				Fragments._SharedVariable__SharedVariable /* 8 */
-			};
+		{
+			Fragments._SharedVariable__OclAny /* 0 */,
+			Fragments._SharedVariable__OclElement /* 1 */,
+			Fragments._SharedVariable__Nameable /* 2 */,
+			Fragments._SharedVariable__Visitable /* 2 */,
+			Fragments._SharedVariable__Element /* 3 */,
+			Fragments._SharedVariable__NamedElement /* 4 */,
+			Fragments._SharedVariable__TypedElement /* 5 */,
+			Fragments._SharedVariable__VariableDeclaration /* 6 */,
+			Fragments._SharedVariable__Variable /* 7 */,
+			Fragments._SharedVariable__SharedVariable /* 8 */
+		};
 		private static final int @NonNull [] __SharedVariable = { 1,1,2,1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _TemplateVariable =
-			{
-				Fragments._TemplateVariable__OclAny /* 0 */,
-				Fragments._TemplateVariable__OclElement /* 1 */,
-				Fragments._TemplateVariable__Nameable /* 2 */,
-				Fragments._TemplateVariable__Visitable /* 2 */,
-				Fragments._TemplateVariable__Element /* 3 */,
-				Fragments._TemplateVariable__NamedElement /* 4 */,
-				Fragments._TemplateVariable__TypedElement /* 5 */,
-				Fragments._TemplateVariable__VariableDeclaration /* 6 */,
-				Fragments._TemplateVariable__Variable /* 7 */,
-				Fragments._TemplateVariable__TemplateVariable /* 8 */
-			};
+		{
+			Fragments._TemplateVariable__OclAny /* 0 */,
+			Fragments._TemplateVariable__OclElement /* 1 */,
+			Fragments._TemplateVariable__Nameable /* 2 */,
+			Fragments._TemplateVariable__Visitable /* 2 */,
+			Fragments._TemplateVariable__Element /* 3 */,
+			Fragments._TemplateVariable__NamedElement /* 4 */,
+			Fragments._TemplateVariable__TypedElement /* 5 */,
+			Fragments._TemplateVariable__VariableDeclaration /* 6 */,
+			Fragments._TemplateVariable__Variable /* 7 */,
+			Fragments._TemplateVariable__TemplateVariable /* 8 */
+		};
 		private static final int @NonNull [] __TemplateVariable = { 1,1,2,1,1,1,1,1,1 };
 
 		/**
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/QVTrelationPackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/QVTrelationPackageImpl.java
index eb589763e..16975d7f8 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/QVTrelationPackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/QVTrelationPackageImpl.java
@@ -180,13 +180,12 @@ public class QVTrelationPackageImpl extends EPackageImpl implements QVTrelationP
 
 		// Register package validator
 		EValidator.Registry.INSTANCE.put
-		(theQVTrelationPackage,
-			new EValidator.Descriptor() {
-			@Override
-			public EValidator getEValidator() {
-				return QVTrelationValidator.INSTANCE;
-			}
-		});
+			(theQVTrelationPackage,
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return QVTrelationValidator.INSTANCE;
+				 }
+			 });
 
 		// Mark meta-data to indicate it can't be changed
 		theQVTrelationPackage.freeze();
@@ -1095,10 +1094,10 @@ public class QVTrelationPackageImpl extends EPackageImpl implements QVTrelationP
 	protected void createEcoreAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore";
 		addAnnotation
-		(this,
-			source,
-			new String[] {
-		});
+		  (this,
+		   source,
+		   new String[] {
+		   });
 	}
 
 	/**
@@ -1110,59 +1109,59 @@ public class QVTrelationPackageImpl extends EPackageImpl implements QVTrelationP
 	protected void createEmofAnnotations() {
 		String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
 		addAnnotation
-		(getKey_Identifies(),
-			source,
-			new String[] {
-				"body", "key"
-		});
+		  (getKey_Identifies(),
+		   source,
+		   new String[] {
+			   "body", "key"
+		   });
 		addAnnotation
-		(getKey_OppositePart(),
-			source,
-			new String[] {
-				"body", "oppKey"
-		});
+		  (getKey_OppositePart(),
+		   source,
+		   new String[] {
+			   "body", "oppKey"
+		   });
 		addAnnotation
-		(getKey_Part(),
-			source,
-			new String[] {
-				"body", "key"
-		});
+		  (getKey_Part(),
+		   source,
+		   new String[] {
+			   "body", "key"
+		   });
 		addAnnotation
-		(getRelation_When(),
-			source,
-			new String[] {
-				"body", "whenOwner"
-		});
+		  (getRelation_When(),
+		   source,
+		   new String[] {
+			   "body", "whenOwner"
+		   });
 		addAnnotation
-		(getRelation_Where(),
-			source,
-			new String[] {
-				"body", "whereOwner"
-		});
+		  (getRelation_Where(),
+		   source,
+		   new String[] {
+			   "body", "whereOwner"
+		   });
 		addAnnotation
-		(getRelationCallExp_Argument(),
-			source,
-			new String[] {
-				"body", "relationCallExp"
-		});
+		  (getRelationCallExp_Argument(),
+		   source,
+		   new String[] {
+			   "body", "relationCallExp"
+		   });
 		addAnnotation
-		(getRelationCallExp_ReferredRelation(),
-			source,
-			new String[] {
-				"body", "relationCallExp"
-		});
+		  (getRelationCallExp_ReferredRelation(),
+		   source,
+		   new String[] {
+			   "body", "relationCallExp"
+		   });
 		addAnnotation
-		(getRelationDomainAssignment_ValueExp(),
-			source,
-			new String[] {
-				"body", "domainAssignment"
-		});
+		  (getRelationDomainAssignment_ValueExp(),
+		   source,
+		   new String[] {
+			   "body", "domainAssignment"
+		   });
 		addAnnotation
-		(getRelationDomainAssignment_Variable(),
-			source,
-			new String[] {
-				"body", "domainAssignment"
-		});
+		  (getRelationDomainAssignment_Variable(),
+		   source,
+		   new String[] {
+			   "body", "domainAssignment"
+		   });
 	}
 
 	/**
@@ -1174,113 +1173,113 @@ public class QVTrelationPackageImpl extends EPackageImpl implements QVTrelationP
 	protected void createUMLAnnotations() {
 		String source = "http://www.eclipse.org/uml2/2.0.0/UML";
 		addAnnotation
-		(getKey__ValidateIdentifiesIsNotAbstract__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "IdentifiesIsNotAbstract"
-		});
+		  (getKey__ValidateIdentifiesIsNotAbstract__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "IdentifiesIsNotAbstract"
+		   });
 		addAnnotation
-		(getKey__ValidateIdentifiesIsAUsedPackageClass__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "IdentifiesIsAUsedPackageClass"
-		});
+		  (getKey__ValidateIdentifiesIsAUsedPackageClass__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "IdentifiesIsAUsedPackageClass"
+		   });
 		addAnnotation
-		(getKey__ValidateNoSuperKeys__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "NoSuperKeys"
-		});
+		  (getKey__ValidateNoSuperKeys__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "NoSuperKeys"
+		   });
 		addAnnotation
-		(getKey__ValidateIdentifiesIsUnique__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "IdentifiesIsUnique"
-		});
+		  (getKey__ValidateIdentifiesIsUnique__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "IdentifiesIsUnique"
+		   });
 		addAnnotation
-		(getKey__ValidateOppositePartsHaveOpposites__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "OppositePartsHaveOpposites"
-		});
+		  (getKey__ValidateOppositePartsHaveOpposites__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "OppositePartsHaveOpposites"
+		   });
 		addAnnotation
-		(getKey__ValidateOppositePartsAreOppositeParts__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "OppositePartsAreOppositeParts"
-		});
+		  (getKey__ValidateOppositePartsAreOppositeParts__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "OppositePartsAreOppositeParts"
+		   });
 		addAnnotation
-		(getKey__ValidatePartsAreParts__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "PartsAreParts"
-		});
+		  (getKey__ValidatePartsAreParts__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "PartsAreParts"
+		   });
 		addAnnotation
-		(getKey__ValidatePartsAreUnique__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "PartsAreUnique"
-		});
+		  (getKey__ValidatePartsAreUnique__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "PartsAreUnique"
+		   });
 		addAnnotation
-		(getRelation__ValidateDomainsAreRelationDomains__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "DomainsAreRelationDomains"
-		});
+		  (getRelation__ValidateDomainsAreRelationDomains__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "DomainsAreRelationDomains"
+		   });
 		addAnnotation
-		(getRelation__ValidateTopRelationOverriddenByTopRelation__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "TopRelationOverriddenByTopRelation"
-		});
+		  (getRelation__ValidateTopRelationOverriddenByTopRelation__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "TopRelationOverriddenByTopRelation"
+		   });
 		addAnnotation
-		(getRelation__ValidateTransformationIsRelationalTransformation__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "TransformationIsRelationalTransformation"
-		});
+		  (getRelation__ValidateTransformationIsRelationalTransformation__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "TransformationIsRelationalTransformation"
+		   });
 		addAnnotation
-		(getRelationCallExp__ValidateMatchingArgumentCount__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "MatchingArgumentCount"
-		});
+		  (getRelationCallExp__ValidateMatchingArgumentCount__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "MatchingArgumentCount"
+		   });
 		addAnnotation
-		(getRelationCallExp__ValidateWhereInvocationIsANonTopRelation__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "WhereInvocationIsANonTopRelation"
-		});
+		  (getRelationCallExp__ValidateWhereInvocationIsANonTopRelation__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "WhereInvocationIsANonTopRelation"
+		   });
 		addAnnotation
-		(getRelationDomain__ValidateRelationDomainAssignmentsAreUnique__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "RelationDomainAssignmentsAreUnique"
-		});
+		  (getRelationDomain__ValidateRelationDomainAssignmentsAreUnique__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "RelationDomainAssignmentsAreUnique"
+		   });
 		addAnnotation
-		(getRelationDomainAssignment__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForValue"
-		});
+		  (getRelationDomainAssignment__ValidateCompatibleTypeForValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForValue"
+		   });
 		addAnnotation
-		(getRelationalTransformation__ValidateRulesAreRelations__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "RulesAreRelations"
-		});
+		  (getRelationalTransformation__ValidateRulesAreRelations__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "RulesAreRelations"
+		   });
 		addAnnotation
-		(getSharedVariable__ValidateCompatibleTypeForInitializer__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForInitializer"
-		});
+		  (getSharedVariable__ValidateCompatibleTypeForInitializer__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForInitializer"
+		   });
 		addAnnotation
-		(getSharedVariable__ValidateCompatibleNullityForInitializer__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleNullityForInitializer"
-		});
+		  (getSharedVariable__ValidateCompatibleNullityForInitializer__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleNullityForInitializer"
+		   });
 	}
 
 } //QVTrelationPackageImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/RelationCallExpImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/RelationCallExpImpl.java
index 1bddd2522..4d0b092ef 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/RelationCallExpImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/impl/RelationCallExpImpl.java
@@ -327,7 +327,7 @@ public class RelationCallExpImpl extends OCLExpressionImpl implements RelationCa
 						 */
 						@Override
 						public @Nullable Object evaluate(final @NonNull Executor executor, final @NonNull TypeId typeId, final @Nullable Object asOrderedSet, final /*@NonInvalid*/ java.lang.@Nullable Object e_0) {
-							final /*@NonInvalid*/ java.lang.@Nullable Object symbol_0 = e_0;
+							final /*@NonInvalid*/ java.lang.@Nullable Object symbol_0 = (Object)e_0;
 							final /*@Thrown*/ java.lang.@Nullable Object oclContainer = ClassifierOclContainerOperation.INSTANCE.evaluate(executor, symbol_0);
 							return oclContainer;
 						}
@@ -361,7 +361,7 @@ public class RelationCallExpImpl extends OCLExpressionImpl implements RelationCa
 						 */
 						@Override
 						public @Nullable Object evaluate(final @NonNull Executor executor, final @NonNull TypeId typeId, final @Nullable Object asOrderedSet_0, final /*@NonInvalid*/ java.lang.@Nullable Object e_1) {
-							final /*@NonInvalid*/ java.lang.@Nullable Object symbol_1 = e_1;
+							final /*@NonInvalid*/ java.lang.@Nullable Object symbol_1 = (Object)e_1;
 							final /*@Thrown*/ java.lang.@Nullable Object oclContainer_0 = ClassifierOclContainerOperation.INSTANCE.evaluate(executor, symbol_1);
 							return oclContainer_0;
 						}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationValidator.java b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationValidator.java
index b6c2df42f..9b10ce652 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationValidator.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/emf-gen/org/eclipse/qvtd/pivot/qvtrelation/util/QVTrelationValidator.java
@@ -250,7 +250,7 @@ public class QVTrelationValidator extends EObjectValidator {
 	 */
 	@Override
 	protected EPackage getEPackage() {
-		return QVTrelationPackage.eINSTANCE;
+	  return QVTrelationPackage.eINSTANCE;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore b/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore
index 40b0f704b..9c7d3f989 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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" xmi:id="P-qvtrelation" name="qvtrelation" nsURI="http://www.eclipse.org/qvt/2015/QVTrelation"
-    nsPrefix="qvtr">
+<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"
+    xmi:id="P-qvtrelation" name="qvtrelation" nsURI="http://www.eclipse.org/qvt/2015/QVTrelation" nsPrefix="qvtr">
   <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
     <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
     <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
     <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
   </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-DomainPattern" name="DomainPattern"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Pattern">
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-DomainPattern-relationDomain"
-        name="relationDomain" lowerBound="1" eType="#T-qvtrelation-RelationDomain"
-        eOpposite="#F-qvtrelation-RelationDomain-pattern"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-DomainPattern-templateExpression"
-        name="templateExpression" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore#T-qvttemplate-TemplateExp"
-        containment="true"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-DomainPattern" name="DomainPattern" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Pattern">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-DomainPattern-relationDomain" name="relationDomain" lowerBound="1"
+        eType="#T-qvtrelation-RelationDomain" eOpposite="#F-qvtrelation-RelationDomain-pattern"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-DomainPattern-templateExpression" name="templateExpression"
+        eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore#T-qvttemplate-TemplateExp" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-Key" name="Key" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
     <eOperations name="validateIdentifiesIsNotAbstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -137,30 +133,26 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Key-identifies"
-        name="identifies" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Class">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Key-identifies" name="identifies" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Class">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="key"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Key-oppositePart"
-        name="oppositePart" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Key-oppositePart" name="oppositePart" ordered="false" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="oppKey"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Key-part"
-        name="part" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Key-part" name="part" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="key"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Key-transformation"
-        name="transformation" eType="#T-qvtrelation-RelationalTransformation" transient="true"
-        eOpposite="#F-qvtrelation-RelationalTransformation-ownedKey"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Key-transformation" name="transformation" eType="#T-qvtrelation-RelationalTransformation"
+        transient="true" eOpposite="#F-qvtrelation-RelationalTransformation-ownedKey"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-Relation" name="Relation"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Rule">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-Relation" name="Relation" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Rule">
     <eOperations name="validateDomainsAreRelationDomains" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="DomainsAreRelationDomains"/>
@@ -206,31 +198,25 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtrelation-Relation-isTopLevel"
-        name="isTopLevel" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Relation-operationalImpl"
-        name="operationalImpl" ordered="false" upperBound="-1" eType="#T-qvtrelation-RelationImplementation"
-        containment="true" eOpposite="#F-qvtrelation-RelationImplementation-relation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Relation-variable"
-        name="variable" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Relation-when"
-        name="when" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Pattern"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvtrelation-Relation-isTopLevel" name="isTopLevel" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Relation-operationalImpl" name="operationalImpl" ordered="false"
+        upperBound="-1" eType="#T-qvtrelation-RelationImplementation" containment="true" eOpposite="#F-qvtrelation-RelationImplementation-relation"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Relation-variable" name="variable" ordered="false" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Relation-when" name="when" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Pattern"
         containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="whenOwner"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Relation-where"
-        name="where" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Pattern"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-Relation-where" name="where" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Pattern"
         containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="whereOwner"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationCallExp" name="RelationCallExp"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationCallExp" name="RelationCallExp" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression">
     <eOperations name="validateMatchingArgumentCount" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="MatchingArgumentCount"/>
@@ -261,22 +247,20 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationCallExp-argument"
-        name="argument" lowerBound="2" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationCallExp-argument" name="argument" lowerBound="2" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="relationCallExp"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationCallExp-referredRelation"
-        name="referredRelation" lowerBound="1" eType="#T-qvtrelation-Relation">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationCallExp-referredRelation" name="referredRelation" lowerBound="1"
+        eType="#T-qvtrelation-Relation">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="relationCallExp"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationDomain" name="RelationDomain"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Domain">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationDomain" name="RelationDomain" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Domain">
     <eOperations name="validateRelationDomainAssignmentsAreUnique" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="RelationDomainAssignmentsAreUnique"/>
@@ -292,17 +276,14 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomain-defaultAssignment"
-        name="defaultAssignment" ordered="false" upperBound="-1" eType="#T-qvtrelation-RelationDomainAssignment"
-        containment="true" eOpposite="#F-qvtrelation-RelationDomainAssignment-owner"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomain-pattern"
-        name="pattern" upperBound="-1" eType="#T-qvtrelation-DomainPattern" containment="true"
-        eOpposite="#F-qvtrelation-DomainPattern-relationDomain"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomain-rootVariable"
-        name="rootVariable" lowerBound="1" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomain-defaultAssignment" name="defaultAssignment"
+        ordered="false" upperBound="-1" eType="#T-qvtrelation-RelationDomainAssignment" containment="true" eOpposite="#F-qvtrelation-RelationDomainAssignment-owner"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomain-pattern" name="pattern" upperBound="-1" eType="#T-qvtrelation-DomainPattern"
+        containment="true" eOpposite="#F-qvtrelation-DomainPattern-relationDomain"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomain-rootVariable" name="rootVariable" lowerBound="1"
+        upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationDomainAssignment"
-      name="RelationDomainAssignment" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationDomainAssignment" name="RelationDomainAssignment" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
     <eOperations name="validateCompatibleTypeForValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="CompatibleTypeForValue"/>
@@ -318,35 +299,30 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomainAssignment-owner"
-        name="owner" lowerBound="1" eType="#T-qvtrelation-RelationDomain" eOpposite="#F-qvtrelation-RelationDomain-defaultAssignment"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomainAssignment-valueExp"
-        name="valueExp" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomainAssignment-owner" name="owner" lowerBound="1"
+        eType="#T-qvtrelation-RelationDomain" eOpposite="#F-qvtrelation-RelationDomain-defaultAssignment"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomainAssignment-valueExp" name="valueExp" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="domainAssignment"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomainAssignment-variable"
-        name="variable" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationDomainAssignment-variable" name="variable" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="domainAssignment"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationImplementation"
-      name="RelationImplementation" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationImplementation-impl"
-        name="impl" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Operation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationImplementation-inDirectionOf"
-        name="inDirectionOf" lowerBound="1" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-TypedModel"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationImplementation-relation"
-        name="relation" eType="#T-qvtrelation-Relation" transient="true" eOpposite="#F-qvtrelation-Relation-operationalImpl"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationImplementation" name="RelationImplementation" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationImplementation-impl" name="impl" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Operation"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationImplementation-inDirectionOf" name="inDirectionOf"
+        lowerBound="1" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-TypedModel"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationImplementation-relation" name="relation" eType="#T-qvtrelation-Relation"
+        transient="true" eOpposite="#F-qvtrelation-Relation-operationalImpl"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationModel" name="RelationModel"
-      eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-BaseModel"/>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationalTransformation"
-      name="RelationalTransformation" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Transformation">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationModel" name="RelationModel" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-BaseModel"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-RelationalTransformation" name="RelationalTransformation" eSuperTypes="../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-Transformation">
     <eOperations name="validateRulesAreRelations" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="RulesAreRelations"/>
@@ -362,12 +338,10 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationalTransformation-ownedKey"
-        name="ownedKey" ordered="false" upperBound="-1" eType="#T-qvtrelation-Key"
-        containment="true" eOpposite="#F-qvtrelation-Key-transformation"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-RelationalTransformation-ownedKey" name="ownedKey" ordered="false"
+        upperBound="-1" eType="#T-qvtrelation-Key" containment="true" eOpposite="#F-qvtrelation-Key-transformation"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-SharedVariable" name="SharedVariable"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-SharedVariable" name="SharedVariable" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
     <eOperations name="validateCompatibleTypeForInitializer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="CompatibleTypeForInitializer"/>
@@ -398,9 +372,7 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-SharedVariable-typedModel"
-        name="typedModel" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-TypedModel"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvtrelation-SharedVariable-typedModel" name="typedModel" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#T-qvtbase-TypedModel"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-TemplateVariable" name="TemplateVariable"
-      eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"/>
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvtrelation-TemplateVariable" name="TemplateVariable" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable"/>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.genmodel b/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.genmodel
index d7c2ea6d7..83c01edb3 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.genmodel
+++ b/plugins/org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2017 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.qvtd.pivot.qvtrelation/emf-gen" modelPluginID="org.eclipse.qvtd.pivot.qvtrelation"
     modelName="QVTRelation" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
     copyrightFields="false" runtimeVersion="2.7" usedGenPackages="../../org.eclipse.ocl.pivot/model/Pivot.genmodel#//pivot ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel#//qvtbase ../../org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.genmodel#//qvttemplate"
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/QVTscheduleTables.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/QVTscheduleTables.java
index 9ff5fb62d..69eba00c7 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/QVTscheduleTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/QVTscheduleTables.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * <copyright>
  *
- * Copyright (c) 2013, 2017 Willink Transformations and others.
+ * Copyright (c) 2013, 2018 Willink Transformations 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
@@ -48,7 +48,6 @@ import org.eclipse.qvtd.pivot.qvtschedule.QVTscheduleTables;
  * In order to ensure correct static initialization, a top level class element must be accessed
  * before any nested class element. Therefore an access to PACKAGE.getClass() is recommended.
  */
-@SuppressWarnings("nls")
 public class QVTscheduleTables
 {
 	static {
@@ -841,545 +840,545 @@ public class QVTscheduleTables
 		}
 
 		private static final @NonNull ExecutorFragment @NonNull [] _AbstractDatum =
-			{
-				Fragments._AbstractDatum__OclAny /* 0 */,
-				Fragments._AbstractDatum__OclElement /* 1 */,
-				Fragments._AbstractDatum__Visitable /* 2 */,
-				Fragments._AbstractDatum__Element /* 3 */,
-				Fragments._AbstractDatum__AbstractDatum /* 4 */
-			};
+		{
+			Fragments._AbstractDatum__OclAny /* 0 */,
+			Fragments._AbstractDatum__OclElement /* 1 */,
+			Fragments._AbstractDatum__Visitable /* 2 */,
+			Fragments._AbstractDatum__Element /* 3 */,
+			Fragments._AbstractDatum__AbstractDatum /* 4 */
+		};
 		private static final int @NonNull [] __AbstractDatum = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _BasicMappingRegion =
-			{
-				Fragments._BasicMappingRegion__OclAny /* 0 */,
-				Fragments._BasicMappingRegion__OclElement /* 1 */,
-				Fragments._BasicMappingRegion__Nameable /* 2 */,
-				Fragments._BasicMappingRegion__Symbolable /* 2 */,
-				Fragments._BasicMappingRegion__Visitable /* 2 */,
-				Fragments._BasicMappingRegion__Element /* 3 */,
-				Fragments._BasicMappingRegion__Region /* 4 */,
-				Fragments._BasicMappingRegion__MappingRegion /* 5 */,
-				Fragments._BasicMappingRegion__BasicMappingRegion /* 6 */
-			};
+		{
+			Fragments._BasicMappingRegion__OclAny /* 0 */,
+			Fragments._BasicMappingRegion__OclElement /* 1 */,
+			Fragments._BasicMappingRegion__Nameable /* 2 */,
+			Fragments._BasicMappingRegion__Symbolable /* 2 */,
+			Fragments._BasicMappingRegion__Visitable /* 2 */,
+			Fragments._BasicMappingRegion__Element /* 3 */,
+			Fragments._BasicMappingRegion__Region /* 4 */,
+			Fragments._BasicMappingRegion__MappingRegion /* 5 */,
+			Fragments._BasicMappingRegion__BasicMappingRegion /* 6 */
+		};
 		private static final int @NonNull [] __BasicMappingRegion = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _CastEdge =
-			{
-				Fragments._CastEdge__OclAny /* 0 */,
-				Fragments._CastEdge__OclElement /* 1 */,
-				Fragments._CastEdge__ConnectionEnd /* 2 */,
-				Fragments._CastEdge__Nameable /* 2 */,
-				Fragments._CastEdge__Visitable /* 2 */,
-				Fragments._CastEdge__Element /* 3 */,
-				Fragments._CastEdge__Edge /* 4 */,
-				Fragments._CastEdge__NavigableEdge /* 5 */,
-				Fragments._CastEdge__CastEdge /* 6 */
-			};
+		{
+			Fragments._CastEdge__OclAny /* 0 */,
+			Fragments._CastEdge__OclElement /* 1 */,
+			Fragments._CastEdge__ConnectionEnd /* 2 */,
+			Fragments._CastEdge__Nameable /* 2 */,
+			Fragments._CastEdge__Visitable /* 2 */,
+			Fragments._CastEdge__Element /* 3 */,
+			Fragments._CastEdge__Edge /* 4 */,
+			Fragments._CastEdge__NavigableEdge /* 5 */,
+			Fragments._CastEdge__CastEdge /* 6 */
+		};
 		private static final int @NonNull [] __CastEdge = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _ClassDatum =
-			{
-				Fragments._ClassDatum__OclAny /* 0 */,
-				Fragments._ClassDatum__OclElement /* 1 */,
-				Fragments._ClassDatum__Visitable /* 2 */,
-				Fragments._ClassDatum__Element /* 3 */,
-				Fragments._ClassDatum__AbstractDatum /* 4 */,
-				Fragments._ClassDatum__ClassDatum /* 5 */
-			};
+		{
+			Fragments._ClassDatum__OclAny /* 0 */,
+			Fragments._ClassDatum__OclElement /* 1 */,
+			Fragments._ClassDatum__Visitable /* 2 */,
+			Fragments._ClassDatum__Element /* 3 */,
+			Fragments._ClassDatum__AbstractDatum /* 4 */,
+			Fragments._ClassDatum__ClassDatum /* 5 */
+		};
 		private static final int @NonNull [] __ClassDatum = { 1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _ComposedNode =
-			{
-				Fragments._ComposedNode__OclAny /* 0 */,
-				Fragments._ComposedNode__OclElement /* 1 */,
-				Fragments._ComposedNode__ConnectionEnd /* 2 */,
-				Fragments._ComposedNode__Nameable /* 2 */,
-				Fragments._ComposedNode__Visitable /* 2 */,
-				Fragments._ComposedNode__Element /* 3 */,
-				Fragments._ComposedNode__Node /* 4 */,
-				Fragments._ComposedNode__ComposedNode /* 5 */
-			};
+		{
+			Fragments._ComposedNode__OclAny /* 0 */,
+			Fragments._ComposedNode__OclElement /* 1 */,
+			Fragments._ComposedNode__ConnectionEnd /* 2 */,
+			Fragments._ComposedNode__Nameable /* 2 */,
+			Fragments._ComposedNode__Visitable /* 2 */,
+			Fragments._ComposedNode__Element /* 3 */,
+			Fragments._ComposedNode__Node /* 4 */,
+			Fragments._ComposedNode__ComposedNode /* 5 */
+		};
 		private static final int @NonNull [] __ComposedNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Connection =
-			{
-				Fragments._Connection__OclAny /* 0 */,
-				Fragments._Connection__OclElement /* 1 */,
-				Fragments._Connection__Nameable /* 2 */,
-				Fragments._Connection__Symbolable /* 2 */,
-				Fragments._Connection__Visitable /* 2 */,
-				Fragments._Connection__Element /* 3 */,
-				Fragments._Connection__Connection /* 4 */
-			};
+		{
+			Fragments._Connection__OclAny /* 0 */,
+			Fragments._Connection__OclElement /* 1 */,
+			Fragments._Connection__Nameable /* 2 */,
+			Fragments._Connection__Symbolable /* 2 */,
+			Fragments._Connection__Visitable /* 2 */,
+			Fragments._Connection__Element /* 3 */,
+			Fragments._Connection__Connection /* 4 */
+		};
 		private static final int @NonNull [] __Connection = { 1,1,3,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _ConnectionEnd =
-			{
-				Fragments._ConnectionEnd__OclAny /* 0 */,
-				Fragments._ConnectionEnd__OclElement /* 1 */,
-				Fragments._ConnectionEnd__ConnectionEnd /* 2 */
-			};
+		{
+			Fragments._ConnectionEnd__OclAny /* 0 */,
+			Fragments._ConnectionEnd__OclElement /* 1 */,
+			Fragments._ConnectionEnd__ConnectionEnd /* 2 */
+		};
 		private static final int @NonNull [] __ConnectionEnd = { 1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _ConnectionRole =
-			{
-				Fragments._ConnectionRole__OclAny /* 0 */,
-				Fragments._ConnectionRole__OclElement /* 1 */,
-				Fragments._ConnectionRole__OclType /* 2 */,
-				Fragments._ConnectionRole__OclEnumeration /* 3 */,
-				Fragments._ConnectionRole__ConnectionRole /* 4 */
-			};
+		{
+			Fragments._ConnectionRole__OclAny /* 0 */,
+			Fragments._ConnectionRole__OclElement /* 1 */,
+			Fragments._ConnectionRole__OclType /* 2 */,
+			Fragments._ConnectionRole__OclEnumeration /* 3 */,
+			Fragments._ConnectionRole__ConnectionRole /* 4 */
+		};
 		private static final int @NonNull [] __ConnectionRole = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _DatumConnection =
-			{
-				Fragments._DatumConnection__OclAny /* 0 */,
-				Fragments._DatumConnection__OclElement /* 1 */,
-				Fragments._DatumConnection__Nameable /* 2 */,
-				Fragments._DatumConnection__Symbolable /* 2 */,
-				Fragments._DatumConnection__Visitable /* 2 */,
-				Fragments._DatumConnection__Element /* 3 */,
-				Fragments._DatumConnection__Connection /* 4 */,
-				Fragments._DatumConnection__DatumConnection /* 5 */
-			};
+		{
+			Fragments._DatumConnection__OclAny /* 0 */,
+			Fragments._DatumConnection__OclElement /* 1 */,
+			Fragments._DatumConnection__Nameable /* 2 */,
+			Fragments._DatumConnection__Symbolable /* 2 */,
+			Fragments._DatumConnection__Visitable /* 2 */,
+			Fragments._DatumConnection__Element /* 3 */,
+			Fragments._DatumConnection__Connection /* 4 */,
+			Fragments._DatumConnection__DatumConnection /* 5 */
+		};
 		private static final int @NonNull [] __DatumConnection = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _DependencyNode =
-			{
-				Fragments._DependencyNode__OclAny /* 0 */,
-				Fragments._DependencyNode__OclElement /* 1 */,
-				Fragments._DependencyNode__ConnectionEnd /* 2 */,
-				Fragments._DependencyNode__Nameable /* 2 */,
-				Fragments._DependencyNode__Visitable /* 2 */,
-				Fragments._DependencyNode__Element /* 3 */,
-				Fragments._DependencyNode__Node /* 4 */,
-				Fragments._DependencyNode__DependencyNode /* 5 */
-			};
+		{
+			Fragments._DependencyNode__OclAny /* 0 */,
+			Fragments._DependencyNode__OclElement /* 1 */,
+			Fragments._DependencyNode__ConnectionEnd /* 2 */,
+			Fragments._DependencyNode__Nameable /* 2 */,
+			Fragments._DependencyNode__Visitable /* 2 */,
+			Fragments._DependencyNode__Element /* 3 */,
+			Fragments._DependencyNode__Node /* 4 */,
+			Fragments._DependencyNode__DependencyNode /* 5 */
+		};
 		private static final int @NonNull [] __DependencyNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _DomainUsage =
-			{
-				Fragments._DomainUsage__OclAny /* 0 */,
-				Fragments._DomainUsage__OclElement /* 1 */,
-				Fragments._DomainUsage__DomainUsage /* 2 */
-			};
+		{
+			Fragments._DomainUsage__OclAny /* 0 */,
+			Fragments._DomainUsage__OclElement /* 1 */,
+			Fragments._DomainUsage__DomainUsage /* 2 */
+		};
 		private static final int @NonNull [] __DomainUsage = { 1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Edge =
-			{
-				Fragments._Edge__OclAny /* 0 */,
-				Fragments._Edge__OclElement /* 1 */,
-				Fragments._Edge__Nameable /* 2 */,
-				Fragments._Edge__Visitable /* 2 */,
-				Fragments._Edge__Element /* 3 */,
-				Fragments._Edge__Edge /* 4 */
-			};
+		{
+			Fragments._Edge__OclAny /* 0 */,
+			Fragments._Edge__OclElement /* 1 */,
+			Fragments._Edge__Nameable /* 2 */,
+			Fragments._Edge__Visitable /* 2 */,
+			Fragments._Edge__Element /* 3 */,
+			Fragments._Edge__Edge /* 4 */
+		};
 		private static final int @NonNull [] __Edge = { 1,1,2,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _EdgeConnection =
-			{
-				Fragments._EdgeConnection__OclAny /* 0 */,
-				Fragments._EdgeConnection__OclElement /* 1 */,
-				Fragments._EdgeConnection__Nameable /* 2 */,
-				Fragments._EdgeConnection__Symbolable /* 2 */,
-				Fragments._EdgeConnection__Visitable /* 2 */,
-				Fragments._EdgeConnection__Element /* 3 */,
-				Fragments._EdgeConnection__Connection /* 4 */,
-				Fragments._EdgeConnection__DatumConnection /* 5 */,
-				Fragments._EdgeConnection__EdgeConnection /* 6 */
-			};
+		{
+			Fragments._EdgeConnection__OclAny /* 0 */,
+			Fragments._EdgeConnection__OclElement /* 1 */,
+			Fragments._EdgeConnection__Nameable /* 2 */,
+			Fragments._EdgeConnection__Symbolable /* 2 */,
+			Fragments._EdgeConnection__Visitable /* 2 */,
+			Fragments._EdgeConnection__Element /* 3 */,
+			Fragments._EdgeConnection__Connection /* 4 */,
+			Fragments._EdgeConnection__DatumConnection /* 5 */,
+			Fragments._EdgeConnection__EdgeConnection /* 6 */
+		};
 		private static final int @NonNull [] __EdgeConnection = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _ErrorNode =
-			{
-				Fragments._ErrorNode__OclAny /* 0 */,
-				Fragments._ErrorNode__OclElement /* 1 */,
-				Fragments._ErrorNode__ConnectionEnd /* 2 */,
-				Fragments._ErrorNode__Nameable /* 2 */,
-				Fragments._ErrorNode__Visitable /* 2 */,
-				Fragments._ErrorNode__Element /* 3 */,
-				Fragments._ErrorNode__Node /* 4 */,
-				Fragments._ErrorNode__ErrorNode /* 5 */
-			};
+		{
+			Fragments._ErrorNode__OclAny /* 0 */,
+			Fragments._ErrorNode__OclElement /* 1 */,
+			Fragments._ErrorNode__ConnectionEnd /* 2 */,
+			Fragments._ErrorNode__Nameable /* 2 */,
+			Fragments._ErrorNode__Visitable /* 2 */,
+			Fragments._ErrorNode__Element /* 3 */,
+			Fragments._ErrorNode__Node /* 4 */,
+			Fragments._ErrorNode__ErrorNode /* 5 */
+		};
 		private static final int @NonNull [] __ErrorNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _ExpressionEdge =
-			{
-				Fragments._ExpressionEdge__OclAny /* 0 */,
-				Fragments._ExpressionEdge__OclElement /* 1 */,
-				Fragments._ExpressionEdge__Nameable /* 2 */,
-				Fragments._ExpressionEdge__Visitable /* 2 */,
-				Fragments._ExpressionEdge__Element /* 3 */,
-				Fragments._ExpressionEdge__Edge /* 4 */,
-				Fragments._ExpressionEdge__ExpressionEdge /* 5 */
-			};
+		{
+			Fragments._ExpressionEdge__OclAny /* 0 */,
+			Fragments._ExpressionEdge__OclElement /* 1 */,
+			Fragments._ExpressionEdge__Nameable /* 2 */,
+			Fragments._ExpressionEdge__Visitable /* 2 */,
+			Fragments._ExpressionEdge__Element /* 3 */,
+			Fragments._ExpressionEdge__Edge /* 4 */,
+			Fragments._ExpressionEdge__ExpressionEdge /* 5 */
+		};
 		private static final int @NonNull [] __ExpressionEdge = { 1,1,2,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _InputNode =
-			{
-				Fragments._InputNode__OclAny /* 0 */,
-				Fragments._InputNode__OclElement /* 1 */,
-				Fragments._InputNode__ConnectionEnd /* 2 */,
-				Fragments._InputNode__Nameable /* 2 */,
-				Fragments._InputNode__Visitable /* 2 */,
-				Fragments._InputNode__Element /* 3 */,
-				Fragments._InputNode__Node /* 4 */,
-				Fragments._InputNode__InputNode /* 5 */
-			};
+		{
+			Fragments._InputNode__OclAny /* 0 */,
+			Fragments._InputNode__OclElement /* 1 */,
+			Fragments._InputNode__ConnectionEnd /* 2 */,
+			Fragments._InputNode__Nameable /* 2 */,
+			Fragments._InputNode__Visitable /* 2 */,
+			Fragments._InputNode__Element /* 3 */,
+			Fragments._InputNode__Node /* 4 */,
+			Fragments._InputNode__InputNode /* 5 */
+		};
 		private static final int @NonNull [] __InputNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _IteratedEdge =
-			{
-				Fragments._IteratedEdge__OclAny /* 0 */,
-				Fragments._IteratedEdge__OclElement /* 1 */,
-				Fragments._IteratedEdge__Nameable /* 2 */,
-				Fragments._IteratedEdge__Visitable /* 2 */,
-				Fragments._IteratedEdge__Element /* 3 */,
-				Fragments._IteratedEdge__Edge /* 4 */,
-				Fragments._IteratedEdge__IteratedEdge /* 5 */
-			};
+		{
+			Fragments._IteratedEdge__OclAny /* 0 */,
+			Fragments._IteratedEdge__OclElement /* 1 */,
+			Fragments._IteratedEdge__Nameable /* 2 */,
+			Fragments._IteratedEdge__Visitable /* 2 */,
+			Fragments._IteratedEdge__Element /* 3 */,
+			Fragments._IteratedEdge__Edge /* 4 */,
+			Fragments._IteratedEdge__IteratedEdge /* 5 */
+		};
 		private static final int @NonNull [] __IteratedEdge = { 1,1,2,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _IteratorNode =
-			{
-				Fragments._IteratorNode__OclAny /* 0 */,
-				Fragments._IteratorNode__OclElement /* 1 */,
-				Fragments._IteratorNode__ConnectionEnd /* 2 */,
-				Fragments._IteratorNode__Nameable /* 2 */,
-				Fragments._IteratorNode__Visitable /* 2 */,
-				Fragments._IteratorNode__Element /* 3 */,
-				Fragments._IteratorNode__Node /* 4 */,
-				Fragments._IteratorNode__VariableNode /* 5 */,
-				Fragments._IteratorNode__IteratorNode /* 6 */
-			};
+		{
+			Fragments._IteratorNode__OclAny /* 0 */,
+			Fragments._IteratorNode__OclElement /* 1 */,
+			Fragments._IteratorNode__ConnectionEnd /* 2 */,
+			Fragments._IteratorNode__Nameable /* 2 */,
+			Fragments._IteratorNode__Visitable /* 2 */,
+			Fragments._IteratorNode__Element /* 3 */,
+			Fragments._IteratorNode__Node /* 4 */,
+			Fragments._IteratorNode__VariableNode /* 5 */,
+			Fragments._IteratorNode__IteratorNode /* 6 */
+		};
 		private static final int @NonNull [] __IteratorNode = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _LoadingRegion =
-			{
-				Fragments._LoadingRegion__OclAny /* 0 */,
-				Fragments._LoadingRegion__OclElement /* 1 */,
-				Fragments._LoadingRegion__Nameable /* 2 */,
-				Fragments._LoadingRegion__Symbolable /* 2 */,
-				Fragments._LoadingRegion__Visitable /* 2 */,
-				Fragments._LoadingRegion__Element /* 3 */,
-				Fragments._LoadingRegion__Region /* 4 */,
-				Fragments._LoadingRegion__LoadingRegion /* 5 */
-			};
+		{
+			Fragments._LoadingRegion__OclAny /* 0 */,
+			Fragments._LoadingRegion__OclElement /* 1 */,
+			Fragments._LoadingRegion__Nameable /* 2 */,
+			Fragments._LoadingRegion__Symbolable /* 2 */,
+			Fragments._LoadingRegion__Visitable /* 2 */,
+			Fragments._LoadingRegion__Element /* 3 */,
+			Fragments._LoadingRegion__Region /* 4 */,
+			Fragments._LoadingRegion__LoadingRegion /* 5 */
+		};
 		private static final int @NonNull [] __LoadingRegion = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _MappingAction =
-			{
-				Fragments._MappingAction__OclAny /* 0 */,
-				Fragments._MappingAction__OclElement /* 1 */,
-				Fragments._MappingAction__Visitable /* 2 */,
-				Fragments._MappingAction__Element /* 3 */,
-				Fragments._MappingAction__MappingAction /* 4 */
-			};
+		{
+			Fragments._MappingAction__OclAny /* 0 */,
+			Fragments._MappingAction__OclElement /* 1 */,
+			Fragments._MappingAction__Visitable /* 2 */,
+			Fragments._MappingAction__Element /* 3 */,
+			Fragments._MappingAction__MappingAction /* 4 */
+		};
 		private static final int @NonNull [] __MappingAction = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _MappingRegion =
-			{
-				Fragments._MappingRegion__OclAny /* 0 */,
-				Fragments._MappingRegion__OclElement /* 1 */,
-				Fragments._MappingRegion__Nameable /* 2 */,
-				Fragments._MappingRegion__Symbolable /* 2 */,
-				Fragments._MappingRegion__Visitable /* 2 */,
-				Fragments._MappingRegion__Element /* 3 */,
-				Fragments._MappingRegion__Region /* 4 */,
-				Fragments._MappingRegion__MappingRegion /* 5 */
-			};
+		{
+			Fragments._MappingRegion__OclAny /* 0 */,
+			Fragments._MappingRegion__OclElement /* 1 */,
+			Fragments._MappingRegion__Nameable /* 2 */,
+			Fragments._MappingRegion__Symbolable /* 2 */,
+			Fragments._MappingRegion__Visitable /* 2 */,
+			Fragments._MappingRegion__Element /* 3 */,
+			Fragments._MappingRegion__Region /* 4 */,
+			Fragments._MappingRegion__MappingRegion /* 5 */
+		};
 		private static final int @NonNull [] __MappingRegion = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _MicroMappingRegion =
-			{
-				Fragments._MicroMappingRegion__OclAny /* 0 */,
-				Fragments._MicroMappingRegion__OclElement /* 1 */,
-				Fragments._MicroMappingRegion__Nameable /* 2 */,
-				Fragments._MicroMappingRegion__Symbolable /* 2 */,
-				Fragments._MicroMappingRegion__Visitable /* 2 */,
-				Fragments._MicroMappingRegion__Element /* 3 */,
-				Fragments._MicroMappingRegion__Region /* 4 */,
-				Fragments._MicroMappingRegion__MappingRegion /* 5 */,
-				Fragments._MicroMappingRegion__MicroMappingRegion /* 6 */
-			};
+		{
+			Fragments._MicroMappingRegion__OclAny /* 0 */,
+			Fragments._MicroMappingRegion__OclElement /* 1 */,
+			Fragments._MicroMappingRegion__Nameable /* 2 */,
+			Fragments._MicroMappingRegion__Symbolable /* 2 */,
+			Fragments._MicroMappingRegion__Visitable /* 2 */,
+			Fragments._MicroMappingRegion__Element /* 3 */,
+			Fragments._MicroMappingRegion__Region /* 4 */,
+			Fragments._MicroMappingRegion__MappingRegion /* 5 */,
+			Fragments._MicroMappingRegion__MicroMappingRegion /* 6 */
+		};
 		private static final int @NonNull [] __MicroMappingRegion = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _NamedMappingRegion =
-			{
-				Fragments._NamedMappingRegion__OclAny /* 0 */,
-				Fragments._NamedMappingRegion__OclElement /* 1 */,
-				Fragments._NamedMappingRegion__Nameable /* 2 */,
-				Fragments._NamedMappingRegion__Symbolable /* 2 */,
-				Fragments._NamedMappingRegion__Visitable /* 2 */,
-				Fragments._NamedMappingRegion__Element /* 3 */,
-				Fragments._NamedMappingRegion__Region /* 4 */,
-				Fragments._NamedMappingRegion__MappingRegion /* 5 */,
-				Fragments._NamedMappingRegion__NamedMappingRegion /* 6 */
-			};
+		{
+			Fragments._NamedMappingRegion__OclAny /* 0 */,
+			Fragments._NamedMappingRegion__OclElement /* 1 */,
+			Fragments._NamedMappingRegion__Nameable /* 2 */,
+			Fragments._NamedMappingRegion__Symbolable /* 2 */,
+			Fragments._NamedMappingRegion__Visitable /* 2 */,
+			Fragments._NamedMappingRegion__Element /* 3 */,
+			Fragments._NamedMappingRegion__Region /* 4 */,
+			Fragments._NamedMappingRegion__MappingRegion /* 5 */,
+			Fragments._NamedMappingRegion__NamedMappingRegion /* 6 */
+		};
 		private static final int @NonNull [] __NamedMappingRegion = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _NavigableEdge =
-			{
-				Fragments._NavigableEdge__OclAny /* 0 */,
-				Fragments._NavigableEdge__OclElement /* 1 */,
-				Fragments._NavigableEdge__ConnectionEnd /* 2 */,
-				Fragments._NavigableEdge__Nameable /* 2 */,
-				Fragments._NavigableEdge__Visitable /* 2 */,
-				Fragments._NavigableEdge__Element /* 3 */,
-				Fragments._NavigableEdge__Edge /* 4 */,
-				Fragments._NavigableEdge__NavigableEdge /* 5 */
-			};
+		{
+			Fragments._NavigableEdge__OclAny /* 0 */,
+			Fragments._NavigableEdge__OclElement /* 1 */,
+			Fragments._NavigableEdge__ConnectionEnd /* 2 */,
+			Fragments._NavigableEdge__Nameable /* 2 */,
+			Fragments._NavigableEdge__Visitable /* 2 */,
+			Fragments._NavigableEdge__Element /* 3 */,
+			Fragments._NavigableEdge__Edge /* 4 */,
+			Fragments._NavigableEdge__NavigableEdge /* 5 */
+		};
 		private static final int @NonNull [] __NavigableEdge = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _NavigationEdge =
-			{
-				Fragments._NavigationEdge__OclAny /* 0 */,
-				Fragments._NavigationEdge__OclElement /* 1 */,
-				Fragments._NavigationEdge__ConnectionEnd /* 2 */,
-				Fragments._NavigationEdge__Nameable /* 2 */,
-				Fragments._NavigationEdge__Visitable /* 2 */,
-				Fragments._NavigationEdge__Element /* 3 */,
-				Fragments._NavigationEdge__Edge /* 4 */,
-				Fragments._NavigationEdge__NavigableEdge /* 5 */,
-				Fragments._NavigationEdge__NavigationEdge /* 6 */
-			};
+		{
+			Fragments._NavigationEdge__OclAny /* 0 */,
+			Fragments._NavigationEdge__OclElement /* 1 */,
+			Fragments._NavigationEdge__ConnectionEnd /* 2 */,
+			Fragments._NavigationEdge__Nameable /* 2 */,
+			Fragments._NavigationEdge__Visitable /* 2 */,
+			Fragments._NavigationEdge__Element /* 3 */,
+			Fragments._NavigationEdge__Edge /* 4 */,
+			Fragments._NavigationEdge__NavigableEdge /* 5 */,
+			Fragments._NavigationEdge__NavigationEdge /* 6 */
+		};
 		private static final int @NonNull [] __NavigationEdge = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Node =
-			{
-				Fragments._Node__OclAny /* 0 */,
-				Fragments._Node__OclElement /* 1 */,
-				Fragments._Node__ConnectionEnd /* 2 */,
-				Fragments._Node__Nameable /* 2 */,
-				Fragments._Node__Visitable /* 2 */,
-				Fragments._Node__Element /* 3 */,
-				Fragments._Node__Node /* 4 */
-			};
+		{
+			Fragments._Node__OclAny /* 0 */,
+			Fragments._Node__OclElement /* 1 */,
+			Fragments._Node__ConnectionEnd /* 2 */,
+			Fragments._Node__Nameable /* 2 */,
+			Fragments._Node__Visitable /* 2 */,
+			Fragments._Node__Element /* 3 */,
+			Fragments._Node__Node /* 4 */
+		};
 		private static final int @NonNull [] __Node = { 1,1,3,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _NodeConnection =
-			{
-				Fragments._NodeConnection__OclAny /* 0 */,
-				Fragments._NodeConnection__OclElement /* 1 */,
-				Fragments._NodeConnection__Nameable /* 2 */,
-				Fragments._NodeConnection__Symbolable /* 2 */,
-				Fragments._NodeConnection__Visitable /* 2 */,
-				Fragments._NodeConnection__Element /* 3 */,
-				Fragments._NodeConnection__Connection /* 4 */,
-				Fragments._NodeConnection__DatumConnection /* 5 */,
-				Fragments._NodeConnection__NodeConnection /* 6 */
-			};
+		{
+			Fragments._NodeConnection__OclAny /* 0 */,
+			Fragments._NodeConnection__OclElement /* 1 */,
+			Fragments._NodeConnection__Nameable /* 2 */,
+			Fragments._NodeConnection__Symbolable /* 2 */,
+			Fragments._NodeConnection__Visitable /* 2 */,
+			Fragments._NodeConnection__Element /* 3 */,
+			Fragments._NodeConnection__Connection /* 4 */,
+			Fragments._NodeConnection__DatumConnection /* 5 */,
+			Fragments._NodeConnection__NodeConnection /* 6 */
+		};
 		private static final int @NonNull [] __NodeConnection = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _NullNode =
-			{
-				Fragments._NullNode__OclAny /* 0 */,
-				Fragments._NullNode__OclElement /* 1 */,
-				Fragments._NullNode__ConnectionEnd /* 2 */,
-				Fragments._NullNode__Nameable /* 2 */,
-				Fragments._NullNode__Visitable /* 2 */,
-				Fragments._NullNode__Element /* 3 */,
-				Fragments._NullNode__Node /* 4 */,
-				Fragments._NullNode__NullNode /* 5 */
-			};
+		{
+			Fragments._NullNode__OclAny /* 0 */,
+			Fragments._NullNode__OclElement /* 1 */,
+			Fragments._NullNode__ConnectionEnd /* 2 */,
+			Fragments._NullNode__Nameable /* 2 */,
+			Fragments._NullNode__Visitable /* 2 */,
+			Fragments._NullNode__Element /* 3 */,
+			Fragments._NullNode__Node /* 4 */,
+			Fragments._NullNode__NullNode /* 5 */
+		};
 		private static final int @NonNull [] __NullNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _OperationNode =
-			{
-				Fragments._OperationNode__OclAny /* 0 */,
-				Fragments._OperationNode__OclElement /* 1 */,
-				Fragments._OperationNode__ConnectionEnd /* 2 */,
-				Fragments._OperationNode__Nameable /* 2 */,
-				Fragments._OperationNode__Visitable /* 2 */,
-				Fragments._OperationNode__Element /* 3 */,
-				Fragments._OperationNode__Node /* 4 */,
-				Fragments._OperationNode__OperationNode /* 5 */
-			};
+		{
+			Fragments._OperationNode__OclAny /* 0 */,
+			Fragments._OperationNode__OclElement /* 1 */,
+			Fragments._OperationNode__ConnectionEnd /* 2 */,
+			Fragments._OperationNode__Nameable /* 2 */,
+			Fragments._OperationNode__Visitable /* 2 */,
+			Fragments._OperationNode__Element /* 3 */,
+			Fragments._OperationNode__Node /* 4 */,
+			Fragments._OperationNode__OperationNode /* 5 */
+		};
 		private static final int @NonNull [] __OperationNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _OperationRegion =
-			{
-				Fragments._OperationRegion__OclAny /* 0 */,
-				Fragments._OperationRegion__OclElement /* 1 */,
-				Fragments._OperationRegion__Nameable /* 2 */,
-				Fragments._OperationRegion__Symbolable /* 2 */,
-				Fragments._OperationRegion__Visitable /* 2 */,
-				Fragments._OperationRegion__Element /* 3 */,
-				Fragments._OperationRegion__Region /* 4 */,
-				Fragments._OperationRegion__OperationRegion /* 5 */
-			};
+		{
+			Fragments._OperationRegion__OclAny /* 0 */,
+			Fragments._OperationRegion__OclElement /* 1 */,
+			Fragments._OperationRegion__Nameable /* 2 */,
+			Fragments._OperationRegion__Symbolable /* 2 */,
+			Fragments._OperationRegion__Visitable /* 2 */,
+			Fragments._OperationRegion__Element /* 3 */,
+			Fragments._OperationRegion__Region /* 4 */,
+			Fragments._OperationRegion__OperationRegion /* 5 */
+		};
 		private static final int @NonNull [] __OperationRegion = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _PatternTypedNode =
-			{
-				Fragments._PatternTypedNode__OclAny /* 0 */,
-				Fragments._PatternTypedNode__OclElement /* 1 */,
-				Fragments._PatternTypedNode__ConnectionEnd /* 2 */,
-				Fragments._PatternTypedNode__Nameable /* 2 */,
-				Fragments._PatternTypedNode__Visitable /* 2 */,
-				Fragments._PatternTypedNode__Element /* 3 */,
-				Fragments._PatternTypedNode__Node /* 4 */,
-				Fragments._PatternTypedNode__PatternTypedNode /* 5 */
-			};
+		{
+			Fragments._PatternTypedNode__OclAny /* 0 */,
+			Fragments._PatternTypedNode__OclElement /* 1 */,
+			Fragments._PatternTypedNode__ConnectionEnd /* 2 */,
+			Fragments._PatternTypedNode__Nameable /* 2 */,
+			Fragments._PatternTypedNode__Visitable /* 2 */,
+			Fragments._PatternTypedNode__Element /* 3 */,
+			Fragments._PatternTypedNode__Node /* 4 */,
+			Fragments._PatternTypedNode__PatternTypedNode /* 5 */
+		};
 		private static final int @NonNull [] __PatternTypedNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _PatternVariableNode =
-			{
-				Fragments._PatternVariableNode__OclAny /* 0 */,
-				Fragments._PatternVariableNode__OclElement /* 1 */,
-				Fragments._PatternVariableNode__ConnectionEnd /* 2 */,
-				Fragments._PatternVariableNode__Nameable /* 2 */,
-				Fragments._PatternVariableNode__Visitable /* 2 */,
-				Fragments._PatternVariableNode__Element /* 3 */,
-				Fragments._PatternVariableNode__Node /* 4 */,
-				Fragments._PatternVariableNode__VariableNode /* 5 */,
-				Fragments._PatternVariableNode__PatternVariableNode /* 6 */
-			};
+		{
+			Fragments._PatternVariableNode__OclAny /* 0 */,
+			Fragments._PatternVariableNode__OclElement /* 1 */,
+			Fragments._PatternVariableNode__ConnectionEnd /* 2 */,
+			Fragments._PatternVariableNode__Nameable /* 2 */,
+			Fragments._PatternVariableNode__Visitable /* 2 */,
+			Fragments._PatternVariableNode__Element /* 3 */,
+			Fragments._PatternVariableNode__Node /* 4 */,
+			Fragments._PatternVariableNode__VariableNode /* 5 */,
+			Fragments._PatternVariableNode__PatternVariableNode /* 6 */
+		};
 		private static final int @NonNull [] __PatternVariableNode = { 1,1,3,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _PredicateEdge =
-			{
-				Fragments._PredicateEdge__OclAny /* 0 */,
-				Fragments._PredicateEdge__OclElement /* 1 */,
-				Fragments._PredicateEdge__Nameable /* 2 */,
-				Fragments._PredicateEdge__Visitable /* 2 */,
-				Fragments._PredicateEdge__Element /* 3 */,
-				Fragments._PredicateEdge__Edge /* 4 */,
-				Fragments._PredicateEdge__PredicateEdge /* 5 */
-			};
+		{
+			Fragments._PredicateEdge__OclAny /* 0 */,
+			Fragments._PredicateEdge__OclElement /* 1 */,
+			Fragments._PredicateEdge__Nameable /* 2 */,
+			Fragments._PredicateEdge__Visitable /* 2 */,
+			Fragments._PredicateEdge__Element /* 3 */,
+			Fragments._PredicateEdge__Edge /* 4 */,
+			Fragments._PredicateEdge__PredicateEdge /* 5 */
+		};
 		private static final int @NonNull [] __PredicateEdge = { 1,1,2,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _PropertyDatum =
-			{
-				Fragments._PropertyDatum__OclAny /* 0 */,
-				Fragments._PropertyDatum__OclElement /* 1 */,
-				Fragments._PropertyDatum__Visitable /* 2 */,
-				Fragments._PropertyDatum__Element /* 3 */,
-				Fragments._PropertyDatum__AbstractDatum /* 4 */,
-				Fragments._PropertyDatum__PropertyDatum /* 5 */
-			};
+		{
+			Fragments._PropertyDatum__OclAny /* 0 */,
+			Fragments._PropertyDatum__OclElement /* 1 */,
+			Fragments._PropertyDatum__Visitable /* 2 */,
+			Fragments._PropertyDatum__Element /* 3 */,
+			Fragments._PropertyDatum__AbstractDatum /* 4 */,
+			Fragments._PropertyDatum__PropertyDatum /* 5 */
+		};
 		private static final int @NonNull [] __PropertyDatum = { 1,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _RecursionEdge =
-			{
-				Fragments._RecursionEdge__OclAny /* 0 */,
-				Fragments._RecursionEdge__OclElement /* 1 */,
-				Fragments._RecursionEdge__Nameable /* 2 */,
-				Fragments._RecursionEdge__Visitable /* 2 */,
-				Fragments._RecursionEdge__Element /* 3 */,
-				Fragments._RecursionEdge__Edge /* 4 */,
-				Fragments._RecursionEdge__RecursionEdge /* 5 */
-			};
+		{
+			Fragments._RecursionEdge__OclAny /* 0 */,
+			Fragments._RecursionEdge__OclElement /* 1 */,
+			Fragments._RecursionEdge__Nameable /* 2 */,
+			Fragments._RecursionEdge__Visitable /* 2 */,
+			Fragments._RecursionEdge__Element /* 3 */,
+			Fragments._RecursionEdge__Edge /* 4 */,
+			Fragments._RecursionEdge__RecursionEdge /* 5 */
+		};
 		private static final int @NonNull [] __RecursionEdge = { 1,1,2,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Region =
-			{
-				Fragments._Region__OclAny /* 0 */,
-				Fragments._Region__OclElement /* 1 */,
-				Fragments._Region__Nameable /* 2 */,
-				Fragments._Region__Symbolable /* 2 */,
-				Fragments._Region__Visitable /* 2 */,
-				Fragments._Region__Element /* 3 */,
-				Fragments._Region__Region /* 4 */
-			};
+		{
+			Fragments._Region__OclAny /* 0 */,
+			Fragments._Region__OclElement /* 1 */,
+			Fragments._Region__Nameable /* 2 */,
+			Fragments._Region__Symbolable /* 2 */,
+			Fragments._Region__Visitable /* 2 */,
+			Fragments._Region__Element /* 3 */,
+			Fragments._Region__Region /* 4 */
+		};
 		private static final int @NonNull [] __Region = { 1,1,3,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Role =
-			{
-				Fragments._Role__OclAny /* 0 */,
-				Fragments._Role__OclElement /* 1 */,
-				Fragments._Role__OclType /* 2 */,
-				Fragments._Role__OclEnumeration /* 3 */,
-				Fragments._Role__Role /* 4 */
-			};
+		{
+			Fragments._Role__OclAny /* 0 */,
+			Fragments._Role__OclElement /* 1 */,
+			Fragments._Role__OclType /* 2 */,
+			Fragments._Role__OclEnumeration /* 3 */,
+			Fragments._Role__Role /* 4 */
+		};
 		private static final int @NonNull [] __Role = { 1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _ScheduleModel =
-			{
-				Fragments._ScheduleModel__OclAny /* 0 */,
-				Fragments._ScheduleModel__OclElement /* 1 */,
-				Fragments._ScheduleModel__Nameable /* 2 */,
-				Fragments._ScheduleModel__Visitable /* 2 */,
-				Fragments._ScheduleModel__Element /* 3 */,
-				Fragments._ScheduleModel__NamedElement /* 4 */,
-				Fragments._ScheduleModel__Namespace /* 5 */,
-				Fragments._ScheduleModel__Model /* 6 */,
-				Fragments._ScheduleModel__ScheduleModel /* 7 */
-			};
+		{
+			Fragments._ScheduleModel__OclAny /* 0 */,
+			Fragments._ScheduleModel__OclElement /* 1 */,
+			Fragments._ScheduleModel__Nameable /* 2 */,
+			Fragments._ScheduleModel__Visitable /* 2 */,
+			Fragments._ScheduleModel__Element /* 3 */,
+			Fragments._ScheduleModel__NamedElement /* 4 */,
+			Fragments._ScheduleModel__Namespace /* 5 */,
+			Fragments._ScheduleModel__Model /* 6 */,
+			Fragments._ScheduleModel__ScheduleModel /* 7 */
+		};
 		private static final int @NonNull [] __ScheduleModel = { 1,1,2,1,1,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _ScheduledRegion =
-			{
-				Fragments._ScheduledRegion__OclAny /* 0 */,
-				Fragments._ScheduledRegion__OclElement /* 1 */,
-				Fragments._ScheduledRegion__Nameable /* 2 */,
-				Fragments._ScheduledRegion__Symbolable /* 2 */,
-				Fragments._ScheduledRegion__Visitable /* 2 */,
-				Fragments._ScheduledRegion__Element /* 3 */,
-				Fragments._ScheduledRegion__Region /* 4 */,
-				Fragments._ScheduledRegion__ScheduledRegion /* 5 */
-			};
+		{
+			Fragments._ScheduledRegion__OclAny /* 0 */,
+			Fragments._ScheduledRegion__OclElement /* 1 */,
+			Fragments._ScheduledRegion__Nameable /* 2 */,
+			Fragments._ScheduledRegion__Symbolable /* 2 */,
+			Fragments._ScheduledRegion__Visitable /* 2 */,
+			Fragments._ScheduledRegion__Element /* 3 */,
+			Fragments._ScheduledRegion__Region /* 4 */,
+			Fragments._ScheduledRegion__ScheduledRegion /* 5 */
+		};
 		private static final int @NonNull [] __ScheduledRegion = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _StatusNode =
-			{
-				Fragments._StatusNode__OclAny /* 0 */,
-				Fragments._StatusNode__OclElement /* 1 */,
-				Fragments._StatusNode__ConnectionEnd /* 2 */,
-				Fragments._StatusNode__Nameable /* 2 */,
-				Fragments._StatusNode__Visitable /* 2 */,
-				Fragments._StatusNode__Element /* 3 */,
-				Fragments._StatusNode__Node /* 4 */,
-				Fragments._StatusNode__StatusNode /* 5 */
-			};
+		{
+			Fragments._StatusNode__OclAny /* 0 */,
+			Fragments._StatusNode__OclElement /* 1 */,
+			Fragments._StatusNode__ConnectionEnd /* 2 */,
+			Fragments._StatusNode__Nameable /* 2 */,
+			Fragments._StatusNode__Visitable /* 2 */,
+			Fragments._StatusNode__Element /* 3 */,
+			Fragments._StatusNode__Node /* 4 */,
+			Fragments._StatusNode__StatusNode /* 5 */
+		};
 		private static final int @NonNull [] __StatusNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _Symbolable =
-			{
-				Fragments._Symbolable__OclAny /* 0 */,
-				Fragments._Symbolable__OclElement /* 1 */,
-				Fragments._Symbolable__Symbolable /* 2 */
-			};
+		{
+			Fragments._Symbolable__OclAny /* 0 */,
+			Fragments._Symbolable__OclElement /* 1 */,
+			Fragments._Symbolable__Symbolable /* 2 */
+		};
 		private static final int @NonNull [] __Symbolable = { 1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _TrueNode =
-			{
-				Fragments._TrueNode__OclAny /* 0 */,
-				Fragments._TrueNode__OclElement /* 1 */,
-				Fragments._TrueNode__ConnectionEnd /* 2 */,
-				Fragments._TrueNode__Nameable /* 2 */,
-				Fragments._TrueNode__Visitable /* 2 */,
-				Fragments._TrueNode__Element /* 3 */,
-				Fragments._TrueNode__Node /* 4 */,
-				Fragments._TrueNode__TrueNode /* 5 */
-			};
+		{
+			Fragments._TrueNode__OclAny /* 0 */,
+			Fragments._TrueNode__OclElement /* 1 */,
+			Fragments._TrueNode__ConnectionEnd /* 2 */,
+			Fragments._TrueNode__Nameable /* 2 */,
+			Fragments._TrueNode__Visitable /* 2 */,
+			Fragments._TrueNode__Element /* 3 */,
+			Fragments._TrueNode__Node /* 4 */,
+			Fragments._TrueNode__TrueNode /* 5 */
+		};
 		private static final int @NonNull [] __TrueNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _UnknownNode =
-			{
-				Fragments._UnknownNode__OclAny /* 0 */,
-				Fragments._UnknownNode__OclElement /* 1 */,
-				Fragments._UnknownNode__ConnectionEnd /* 2 */,
-				Fragments._UnknownNode__Nameable /* 2 */,
-				Fragments._UnknownNode__Visitable /* 2 */,
-				Fragments._UnknownNode__Element /* 3 */,
-				Fragments._UnknownNode__Node /* 4 */,
-				Fragments._UnknownNode__UnknownNode /* 5 */
-			};
+		{
+			Fragments._UnknownNode__OclAny /* 0 */,
+			Fragments._UnknownNode__OclElement /* 1 */,
+			Fragments._UnknownNode__ConnectionEnd /* 2 */,
+			Fragments._UnknownNode__Nameable /* 2 */,
+			Fragments._UnknownNode__Visitable /* 2 */,
+			Fragments._UnknownNode__Element /* 3 */,
+			Fragments._UnknownNode__Node /* 4 */,
+			Fragments._UnknownNode__UnknownNode /* 5 */
+		};
 		private static final int @NonNull [] __UnknownNode = { 1,1,3,1,1,1 };
 
 		private static final @NonNull ExecutorFragment @NonNull [] _VariableNode =
-			{
-				Fragments._VariableNode__OclAny /* 0 */,
-				Fragments._VariableNode__OclElement /* 1 */,
-				Fragments._VariableNode__ConnectionEnd /* 2 */,
-				Fragments._VariableNode__Nameable /* 2 */,
-				Fragments._VariableNode__Visitable /* 2 */,
-				Fragments._VariableNode__Element /* 3 */,
-				Fragments._VariableNode__Node /* 4 */,
-				Fragments._VariableNode__VariableNode /* 5 */
-			};
+		{
+			Fragments._VariableNode__OclAny /* 0 */,
+			Fragments._VariableNode__OclElement /* 1 */,
+			Fragments._VariableNode__ConnectionEnd /* 2 */,
+			Fragments._VariableNode__Nameable /* 2 */,
+			Fragments._VariableNode__Visitable /* 2 */,
+			Fragments._VariableNode__Element /* 3 */,
+			Fragments._VariableNode__Node /* 4 */,
+			Fragments._VariableNode__VariableNode /* 5 */
+		};
 		private static final int @NonNull [] __VariableNode = { 1,1,3,1,1,1 };
 
 		/**
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/QVTschedulePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/QVTschedulePackageImpl.java
index 1fdd44e8a..98b2a148a 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/QVTschedulePackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/QVTschedulePackageImpl.java
@@ -2122,10 +2122,10 @@ public class QVTschedulePackageImpl extends EPackageImpl implements QVTscheduleP
 	protected void createEcoreAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore";
 		addAnnotation
-		(this,
-			source,
-			new String[] {
-		});
+		  (this,
+		   source,
+		   new String[] {
+		   });
 	}
 
 } //QVTschedulePackageImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/QVTscheduleAdapterFactory.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/QVTscheduleAdapterFactory.java
index 7fa3daefb..119c32c3a 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/QVTscheduleAdapterFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/util/QVTscheduleAdapterFactory.java
@@ -84,203 +84,203 @@ public class QVTscheduleAdapterFactory extends AdapterFactoryImpl {
 	 */
 	protected QVTscheduleSwitch<@Nullable Adapter> modelSwitch =
 			new QVTscheduleSwitch<@Nullable Adapter>() {
-		@Override
-		public Adapter caseAbstractDatum(AbstractDatum object) {
-			return createAbstractDatumAdapter();
-		}
-		@Override
-		public Adapter caseBasicMappingRegion(BasicMappingRegion object) {
-			return createBasicMappingRegionAdapter();
-		}
-		@Override
-		public Adapter caseCastEdge(CastEdge object) {
-			return createCastEdgeAdapter();
-		}
-		@Override
-		public Adapter caseClassDatum(ClassDatum object) {
-			return createClassDatumAdapter();
-		}
-		@Override
-		public Adapter caseComposedNode(ComposedNode object) {
-			return createComposedNodeAdapter();
-		}
-		@Override
-		public Adapter caseConnection(Connection object) {
-			return createConnectionAdapter();
-		}
-		@Override
-		public Adapter caseConnectionEnd(ConnectionEnd object) {
-			return createConnectionEndAdapter();
-		}
-		@Override
-		public <CE extends ConnectionEnd> Adapter caseDatumConnection(DatumConnection<CE> object) {
-			return createDatumConnectionAdapter();
-		}
-		@Override
-		public Adapter caseDependencyNode(DependencyNode object) {
-			return createDependencyNodeAdapter();
-		}
-		@Override
-		public Adapter caseEdge(Edge object) {
-			return createEdgeAdapter();
-		}
-		@Override
-		public Adapter caseEdgeConnection(EdgeConnection object) {
-			return createEdgeConnectionAdapter();
-		}
-		@Override
-		public Adapter caseErrorNode(ErrorNode object) {
-			return createErrorNodeAdapter();
-		}
-		@Override
-		public Adapter caseExpressionEdge(ExpressionEdge object) {
-			return createExpressionEdgeAdapter();
-		}
-		@Override
-		public Adapter caseInputNode(InputNode object) {
-			return createInputNodeAdapter();
-		}
-		@Override
-		public Adapter caseIteratedEdge(IteratedEdge object) {
-			return createIteratedEdgeAdapter();
-		}
-		@Override
-		public Adapter caseIteratorNode(IteratorNode object) {
-			return createIteratorNodeAdapter();
-		}
-		@Override
-		public Adapter caseLoadingRegion(LoadingRegion object) {
-			return createLoadingRegionAdapter();
-		}
-		@Override
-		public Adapter caseMappingAction(MappingAction object) {
-			return createMappingActionAdapter();
-		}
-		@Override
-		public Adapter caseMappingRegion(MappingRegion object) {
-			return createMappingRegionAdapter();
-		}
-		@Override
-		public Adapter caseMicroMappingRegion(MicroMappingRegion object) {
-			return createMicroMappingRegionAdapter();
-		}
-		@Override
-		public Adapter caseNamedMappingRegion(NamedMappingRegion object) {
-			return createNamedMappingRegionAdapter();
-		}
-		@Override
-		public Adapter caseNavigableEdge(NavigableEdge object) {
-			return createNavigableEdgeAdapter();
-		}
-		@Override
-		public Adapter caseNavigationEdge(NavigationEdge object) {
-			return createNavigationEdgeAdapter();
-		}
-		@Override
-		public Adapter caseNode(Node object) {
-			return createNodeAdapter();
-		}
-		@Override
-		public Adapter caseNodeConnection(NodeConnection object) {
-			return createNodeConnectionAdapter();
-		}
-		@Override
-		public Adapter caseNullNode(NullNode object) {
-			return createNullNodeAdapter();
-		}
-		@Override
-		public Adapter caseOperationNode(OperationNode object) {
-			return createOperationNodeAdapter();
-		}
-		@Override
-		public Adapter caseOperationRegion(OperationRegion object) {
-			return createOperationRegionAdapter();
-		}
-		@Override
-		public Adapter casePatternTypedNode(PatternTypedNode object) {
-			return createPatternTypedNodeAdapter();
-		}
-		@Override
-		public Adapter casePatternVariableNode(PatternVariableNode object) {
-			return createPatternVariableNodeAdapter();
-		}
-		@Override
-		public Adapter casePredicateEdge(PredicateEdge object) {
-			return createPredicateEdgeAdapter();
-		}
-		@Override
-		public Adapter casePropertyDatum(PropertyDatum object) {
-			return createPropertyDatumAdapter();
-		}
-		@Override
-		public Adapter caseRecursionEdge(RecursionEdge object) {
-			return createRecursionEdgeAdapter();
-		}
-		@Override
-		public Adapter caseRegion(Region object) {
-			return createRegionAdapter();
-		}
-		@Override
-		public Adapter caseScheduleModel(ScheduleModel object) {
-			return createScheduleModelAdapter();
-		}
-		@Override
-		public Adapter caseScheduledRegion(ScheduledRegion object) {
-			return createScheduledRegionAdapter();
-		}
-		@Override
-		public Adapter caseStatusNode(StatusNode object) {
-			return createStatusNodeAdapter();
-		}
-		@Override
-		public Adapter caseSymbolable(Symbolable object) {
-			return createSymbolableAdapter();
-		}
-		@Override
-		public Adapter caseTrueNode(TrueNode object) {
-			return createTrueNodeAdapter();
-		}
-		@Override
-		public Adapter caseUnknownNode(UnknownNode object) {
-			return createUnknownNodeAdapter();
-		}
-		@Override
-		public Adapter caseVariableNode(VariableNode object) {
-			return createVariableNodeAdapter();
-		}
-		@Override
-		public Adapter caseDomainUsage(DomainUsage object) {
-			return createDomainUsageAdapter();
-		}
-		@Override
-		public Adapter caseVisitable(Visitable object) {
-			return createVisitableAdapter();
-		}
-		@Override
-		public Adapter caseElement(Element object) {
-			return createElementAdapter();
-		}
-		@Override
-		public Adapter caseNameable(Nameable object) {
-			return createNameableAdapter();
-		}
-		@Override
-		public Adapter caseNamedElement(NamedElement object) {
-			return createNamedElementAdapter();
-		}
-		@Override
-		public Adapter caseNamespace(Namespace object) {
-			return createNamespaceAdapter();
-		}
-		@Override
-		public Adapter caseModel(Model object) {
-			return createModelAdapter();
-		}
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
+			@Override
+			public Adapter caseAbstractDatum(AbstractDatum object) {
+				return createAbstractDatumAdapter();
+			}
+			@Override
+			public Adapter caseBasicMappingRegion(BasicMappingRegion object) {
+				return createBasicMappingRegionAdapter();
+			}
+			@Override
+			public Adapter caseCastEdge(CastEdge object) {
+				return createCastEdgeAdapter();
+			}
+			@Override
+			public Adapter caseClassDatum(ClassDatum object) {
+				return createClassDatumAdapter();
+			}
+			@Override
+			public Adapter caseComposedNode(ComposedNode object) {
+				return createComposedNodeAdapter();
+			}
+			@Override
+			public Adapter caseConnection(Connection object) {
+				return createConnectionAdapter();
+			}
+			@Override
+			public Adapter caseConnectionEnd(ConnectionEnd object) {
+				return createConnectionEndAdapter();
+			}
+			@Override
+			public <CE extends ConnectionEnd> Adapter caseDatumConnection(DatumConnection<CE> object) {
+				return createDatumConnectionAdapter();
+			}
+			@Override
+			public Adapter caseDependencyNode(DependencyNode object) {
+				return createDependencyNodeAdapter();
+			}
+			@Override
+			public Adapter caseEdge(Edge object) {
+				return createEdgeAdapter();
+			}
+			@Override
+			public Adapter caseEdgeConnection(EdgeConnection object) {
+				return createEdgeConnectionAdapter();
+			}
+			@Override
+			public Adapter caseErrorNode(ErrorNode object) {
+				return createErrorNodeAdapter();
+			}
+			@Override
+			public Adapter caseExpressionEdge(ExpressionEdge object) {
+				return createExpressionEdgeAdapter();
+			}
+			@Override
+			public Adapter caseInputNode(InputNode object) {
+				return createInputNodeAdapter();
+			}
+			@Override
+			public Adapter caseIteratedEdge(IteratedEdge object) {
+				return createIteratedEdgeAdapter();
+			}
+			@Override
+			public Adapter caseIteratorNode(IteratorNode object) {
+				return createIteratorNodeAdapter();
+			}
+			@Override
+			public Adapter caseLoadingRegion(LoadingRegion object) {
+				return createLoadingRegionAdapter();
+			}
+			@Override
+			public Adapter caseMappingAction(MappingAction object) {
+				return createMappingActionAdapter();
+			}
+			@Override
+			public Adapter caseMappingRegion(MappingRegion object) {
+				return createMappingRegionAdapter();
+			}
+			@Override
+			public Adapter caseMicroMappingRegion(MicroMappingRegion object) {
+				return createMicroMappingRegionAdapter();
+			}
+			@Override
+			public Adapter caseNamedMappingRegion(NamedMappingRegion object) {
+				return createNamedMappingRegionAdapter();
+			}
+			@Override
+			public Adapter caseNavigableEdge(NavigableEdge object) {
+				return createNavigableEdgeAdapter();
+			}
+			@Override
+			public Adapter caseNavigationEdge(NavigationEdge object) {
+				return createNavigationEdgeAdapter();
+			}
+			@Override
+			public Adapter caseNode(Node object) {
+				return createNodeAdapter();
+			}
+			@Override
+			public Adapter caseNodeConnection(NodeConnection object) {
+				return createNodeConnectionAdapter();
+			}
+			@Override
+			public Adapter caseNullNode(NullNode object) {
+				return createNullNodeAdapter();
+			}
+			@Override
+			public Adapter caseOperationNode(OperationNode object) {
+				return createOperationNodeAdapter();
+			}
+			@Override
+			public Adapter caseOperationRegion(OperationRegion object) {
+				return createOperationRegionAdapter();
+			}
+			@Override
+			public Adapter casePatternTypedNode(PatternTypedNode object) {
+				return createPatternTypedNodeAdapter();
+			}
+			@Override
+			public Adapter casePatternVariableNode(PatternVariableNode object) {
+				return createPatternVariableNodeAdapter();
+			}
+			@Override
+			public Adapter casePredicateEdge(PredicateEdge object) {
+				return createPredicateEdgeAdapter();
+			}
+			@Override
+			public Adapter casePropertyDatum(PropertyDatum object) {
+				return createPropertyDatumAdapter();
+			}
+			@Override
+			public Adapter caseRecursionEdge(RecursionEdge object) {
+				return createRecursionEdgeAdapter();
+			}
+			@Override
+			public Adapter caseRegion(Region object) {
+				return createRegionAdapter();
+			}
+			@Override
+			public Adapter caseScheduleModel(ScheduleModel object) {
+				return createScheduleModelAdapter();
+			}
+			@Override
+			public Adapter caseScheduledRegion(ScheduledRegion object) {
+				return createScheduledRegionAdapter();
+			}
+			@Override
+			public Adapter caseStatusNode(StatusNode object) {
+				return createStatusNodeAdapter();
+			}
+			@Override
+			public Adapter caseSymbolable(Symbolable object) {
+				return createSymbolableAdapter();
+			}
+			@Override
+			public Adapter caseTrueNode(TrueNode object) {
+				return createTrueNodeAdapter();
+			}
+			@Override
+			public Adapter caseUnknownNode(UnknownNode object) {
+				return createUnknownNodeAdapter();
+			}
+			@Override
+			public Adapter caseVariableNode(VariableNode object) {
+				return createVariableNodeAdapter();
+			}
+			@Override
+			public Adapter caseDomainUsage(DomainUsage object) {
+				return createDomainUsageAdapter();
+			}
+			@Override
+			public Adapter caseVisitable(Visitable object) {
+				return createVisitableAdapter();
+			}
+			@Override
+			public Adapter caseElement(Element object) {
+				return createElementAdapter();
+			}
+			@Override
+			public Adapter caseNameable(Nameable object) {
+				return createNameableAdapter();
+			}
+			@Override
+			public Adapter caseNamedElement(NamedElement object) {
+				return createNamedElementAdapter();
+			}
+			@Override
+			public Adapter caseNamespace(Namespace object) {
+				return createNamespaceAdapter();
+			}
+			@Override
+			public Adapter caseModel(Model object) {
+				return createModelAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/model/QVTschedule.genmodel b/plugins/org.eclipse.qvtd.pivot.qvtschedule/model/QVTschedule.genmodel
index d964525b5..11e689bbf 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/model/QVTschedule.genmodel
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/model/QVTschedule.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2017 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.qvtd.pivot.qvtschedule/emf-gen" modelPluginID="org.eclipse.qvtd.pivot.qvtschedule"
     modelName="QVTSchedule" modelPluginClass="" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.7" usedGenPackages="../../org.eclipse.ocl.pivot/model/Pivot.genmodel#//pivot ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel#//qvtbase ../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.genmodel#//qvtcore"
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/QVTtemplateTables.java b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/QVTtemplateTables.java
index 14d79771d..acf46771b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/QVTtemplateTables.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/QVTtemplateTables.java
@@ -1,15 +1,15 @@
 /*******************************************************************************
  * <copyright>
- * 
- * Copyright (c) 2013, 2017 Willink Transformations and others.
+ *
+ * Copyright (c) 2013, 2018 Willink Transformations 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:
  *   E.D.Willink - Initial API and implementation
- * 
+ *
  * </copyright>
  *************************************************************************
  * This code is 100% auto-generated
@@ -42,7 +42,6 @@ import org.eclipse.qvtd.pivot.qvttemplate.QVTtemplateTables;
  * In order to ensure correct static initialization, a top level class element must be accessed
  * before any nested class element. Therefore an access to PACKAGE.getClass() is recommended.
  */
-@SuppressWarnings("nls")
 public class QVTtemplateTables
 {
 	static {
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/impl/QVTtemplatePackageImpl.java b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/impl/QVTtemplatePackageImpl.java
index 79e209260..0759369ba 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/impl/QVTtemplatePackageImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/impl/QVTtemplatePackageImpl.java
@@ -120,13 +120,12 @@ public class QVTtemplatePackageImpl extends EPackageImpl implements QVTtemplateP
 
 		// Register package validator
 		EValidator.Registry.INSTANCE.put
-		(theQVTtemplatePackage,
-			new EValidator.Descriptor() {
-			@Override
-			public EValidator getEValidator() {
-				return QVTtemplateValidator.INSTANCE;
-			}
-		});
+			(theQVTtemplatePackage,
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return QVTtemplateValidator.INSTANCE;
+				 }
+			 });
 
 		// Mark meta-data to indicate it can't be changed
 		theQVTtemplatePackage.freeze();
@@ -626,10 +625,10 @@ public class QVTtemplatePackageImpl extends EPackageImpl implements QVTtemplateP
 	protected void createEcoreAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/Ecore";
 		addAnnotation
-		(this,
-			source,
-			new String[] {
-		});
+		  (this,
+		   source,
+		   new String[] {
+		   });
 	}
 
 	/**
@@ -641,41 +640,41 @@ public class QVTtemplatePackageImpl extends EPackageImpl implements QVTtemplateP
 	protected void createEmofAnnotations() {
 		String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
 		addAnnotation
-		(getCollectionTemplateExp_Member(),
-			source,
-			new String[] {
-				"body", "listContainer"
-		});
+		  (getCollectionTemplateExp_Member(),
+		   source,
+		   new String[] {
+			   "body", "listContainer"
+		   });
 		addAnnotation
-		(getCollectionTemplateExp_Rest(),
-			source,
-			new String[] {
-				"body", "matchingExp"
-		});
+		  (getCollectionTemplateExp_Rest(),
+		   source,
+		   new String[] {
+			   "body", "matchingExp"
+		   });
 		addAnnotation
-		(getPropertyTemplateItem_ReferredProperty(),
-			source,
-			new String[] {
-				"body", "propertyItem"
-		});
+		  (getPropertyTemplateItem_ReferredProperty(),
+		   source,
+		   new String[] {
+			   "body", "propertyItem"
+		   });
 		addAnnotation
-		(getPropertyTemplateItem_Value(),
-			source,
-			new String[] {
-				"body", "propertyItem"
-		});
+		  (getPropertyTemplateItem_Value(),
+		   source,
+		   new String[] {
+			   "body", "propertyItem"
+		   });
 		addAnnotation
-		(getTemplateExp_BindsTo(),
-			source,
-			new String[] {
-				"body", "templateExp"
-		});
+		  (getTemplateExp_BindsTo(),
+		   source,
+		   new String[] {
+			   "body", "templateExp"
+		   });
 		addAnnotation
-		(getTemplateExp_Where(),
-			source,
-			new String[] {
-				"body", "owner"
-		});
+		  (getTemplateExp_Where(),
+		   source,
+		   new String[] {
+			   "body", "owner"
+		   });
 	}
 
 	/**
@@ -687,65 +686,65 @@ public class QVTtemplatePackageImpl extends EPackageImpl implements QVTtemplateP
 	protected void createUMLAnnotations() {
 		String source = "http://www.eclipse.org/uml2/2.0.0/UML";
 		addAnnotation
-		(getCollectionTemplateExp__ValidateMemberTypeisCollectionElementType__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "MemberTypeisCollectionElementType"
-		});
+		  (getCollectionTemplateExp__ValidateMemberTypeisCollectionElementType__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "MemberTypeisCollectionElementType"
+		   });
 		addAnnotation
-		(getCollectionTemplateExp__ValidateRestTypeisCollectionType__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "RestTypeisCollectionType"
-		});
+		  (getCollectionTemplateExp__ValidateRestTypeisCollectionType__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "RestTypeisCollectionType"
+		   });
 		addAnnotation
-		(getCollectionTemplateExp__ValidateTypeisCollectionType__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "TypeisCollectionType"
-		});
+		  (getCollectionTemplateExp__ValidateTypeisCollectionType__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "TypeisCollectionType"
+		   });
 		addAnnotation
-		(getObjectTemplateExp__ValidatePartPropertyIsUnique__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "PartPropertyIsUnique"
-		});
+		  (getObjectTemplateExp__ValidatePartPropertyIsUnique__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "PartPropertyIsUnique"
+		   });
 		addAnnotation
-		(getObjectTemplateExp__ValidateTypeisObjectType__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "TypeisObjectType"
-		});
+		  (getObjectTemplateExp__ValidateTypeisObjectType__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "TypeisObjectType"
+		   });
 		addAnnotation
-		(getPropertyTemplateItem__ValidateCompatibleClassForProperty__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleClassForProperty"
-		});
+		  (getPropertyTemplateItem__ValidateCompatibleClassForProperty__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleClassForProperty"
+		   });
 		addAnnotation
-		(getPropertyTemplateItem__ValidateCompatibleTypeForObjectValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForObjectValue"
-		});
+		  (getPropertyTemplateItem__ValidateCompatibleTypeForObjectValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForObjectValue"
+		   });
 		addAnnotation
-		(getPropertyTemplateItem__ValidateCompatibleTypeForCollectionElementValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForCollectionElementValue"
-		});
+		  (getPropertyTemplateItem__ValidateCompatibleTypeForCollectionElementValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForCollectionElementValue"
+		   });
 		addAnnotation
-		(getPropertyTemplateItem__ValidateCompatibleTypeForCollectionValue__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "CompatibleTypeForCollectionValue"
-		});
+		  (getPropertyTemplateItem__ValidateCompatibleTypeForCollectionValue__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "CompatibleTypeForCollectionValue"
+		   });
 		addAnnotation
-		(getTemplateExp__ValidateWhereIsBoolean__DiagnosticChain_Map(),
-			source,
-			new String[] {
-				"originalName", "WhereIsBoolean"
-		});
+		  (getTemplateExp__ValidateWhereIsBoolean__DiagnosticChain_Map(),
+		   source,
+		   new String[] {
+			   "originalName", "WhereIsBoolean"
+		   });
 	}
 
 } //QVTtemplatePackageImpl
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/AbstractQVTtemplateAS2XMIidVisitor.java b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/AbstractQVTtemplateAS2XMIidVisitor.java
index c33ccde0e..5b0b84f14 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/AbstractQVTtemplateAS2XMIidVisitor.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/AbstractQVTtemplateAS2XMIidVisitor.java
@@ -30,10 +30,9 @@ import org.eclipse.qvtd.pivot.qvtbase.utilities.QVTbaseAS2XMIidVisitor;
  * until a non-interface super-class is found). In the absence of any
  * suitable first super class, the method delegates to visiting().
  */
-@SuppressWarnings("deprecation")
 public abstract class AbstractQVTtemplateAS2XMIidVisitor
-extends QVTbaseAS2XMIidVisitor
-implements QVTtemplateVisitor<Boolean>
+	extends QVTbaseAS2XMIidVisitor
+	implements QVTtemplateVisitor<Boolean>
 {
 	/**
 	 * Initializes me with an initial value for my result.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateAdapterFactory.java b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateAdapterFactory.java
index fef69c6d0..611752a22 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateAdapterFactory.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/emf-gen/org/eclipse/qvtd/pivot/qvttemplate/util/QVTtemplateAdapterFactory.java
@@ -85,59 +85,59 @@ public class QVTtemplateAdapterFactory extends AdapterFactoryImpl {
 	 */
 	protected QVTtemplateSwitch<@Nullable Adapter> modelSwitch =
 			new QVTtemplateSwitch<@Nullable Adapter>() {
-		@Override
-		public Adapter caseCollectionTemplateExp(CollectionTemplateExp object) {
-			return createCollectionTemplateExpAdapter();
-		}
-		@Override
-		public Adapter caseObjectTemplateExp(ObjectTemplateExp object) {
-			return createObjectTemplateExpAdapter();
-		}
-		@Override
-		public Adapter casePropertyTemplateItem(PropertyTemplateItem object) {
-			return createPropertyTemplateItemAdapter();
-		}
-		@Override
-		public Adapter caseTemplateExp(TemplateExp object) {
-			return createTemplateExpAdapter();
-		}
-		@Override
-		public Adapter caseVisitable(Visitable object) {
-			return createVisitableAdapter();
-		}
-		@Override
-		public Adapter caseElement(Element object) {
-			return createElementAdapter();
-		}
-		@Override
-		public Adapter caseNameable(Nameable object) {
-			return createNameableAdapter();
-		}
-		@Override
-		public Adapter caseNamedElement(NamedElement object) {
-			return createNamedElementAdapter();
-		}
-		@Override
-		public Adapter caseTypedElement(TypedElement object) {
-			return createTypedElementAdapter();
-		}
-		@Override
-		public Adapter caseOCLExpression(OCLExpression object) {
-			return createOCLExpressionAdapter();
-		}
-		@Override
-		public Adapter caseLiteralExp(LiteralExp object) {
-			return createLiteralExpAdapter();
-		}
-		@Override
-		public Adapter caseReferringElement(ReferringElement object) {
-			return createReferringElementAdapter();
-		}
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
+			@Override
+			public Adapter caseCollectionTemplateExp(CollectionTemplateExp object) {
+				return createCollectionTemplateExpAdapter();
+			}
+			@Override
+			public Adapter caseObjectTemplateExp(ObjectTemplateExp object) {
+				return createObjectTemplateExpAdapter();
+			}
+			@Override
+			public Adapter casePropertyTemplateItem(PropertyTemplateItem object) {
+				return createPropertyTemplateItemAdapter();
+			}
+			@Override
+			public Adapter caseTemplateExp(TemplateExp object) {
+				return createTemplateExpAdapter();
+			}
+			@Override
+			public Adapter caseVisitable(Visitable object) {
+				return createVisitableAdapter();
+			}
+			@Override
+			public Adapter caseElement(Element object) {
+				return createElementAdapter();
+			}
+			@Override
+			public Adapter caseNameable(Nameable object) {
+				return createNameableAdapter();
+			}
+			@Override
+			public Adapter caseNamedElement(NamedElement object) {
+				return createNamedElementAdapter();
+			}
+			@Override
+			public Adapter caseTypedElement(TypedElement object) {
+				return createTypedElementAdapter();
+			}
+			@Override
+			public Adapter caseOCLExpression(OCLExpression object) {
+				return createOCLExpressionAdapter();
+			}
+			@Override
+			public Adapter caseLiteralExp(LiteralExp object) {
+				return createLiteralExpAdapter();
+			}
+			@Override
+			public Adapter caseReferringElement(ReferringElement object) {
+				return createReferringElementAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore b/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore
index 9eb74e8a8..e26fdd02e 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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" xmi:id="P-qvttemplate" name="qvttemplate" nsURI="http://www.eclipse.org/qvt/2015/QVTtemplate"
-    nsPrefix="qvtt">
+<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"
+    xmi:id="P-qvttemplate" name="qvttemplate" nsURI="http://www.eclipse.org/qvt/2015/QVTtemplate" nsPrefix="qvtt">
   <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
     <details key="invocationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
     <details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
     <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot"/>
   </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvttemplate-CollectionTemplateExp"
-      name="CollectionTemplateExp" eSuperTypes="#T-qvttemplate-TemplateExp">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvttemplate-CollectionTemplateExp" name="CollectionTemplateExp" eSuperTypes="#T-qvttemplate-TemplateExp">
     <eOperations name="validateMemberTypeisCollectionElementType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="MemberTypeisCollectionElementType"/>
@@ -54,24 +52,21 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-CollectionTemplateExp-member"
-        name="member" ordered="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
-        containment="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-CollectionTemplateExp-member" name="member" ordered="false"
+        upperBound="-1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression" containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="listContainer"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-CollectionTemplateExp-referredCollectionType"
-        name="referredCollectionType" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-CollectionType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-CollectionTemplateExp-rest"
-        name="rest" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-CollectionTemplateExp-referredCollectionType" name="referredCollectionType"
+        lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-CollectionType"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-CollectionTemplateExp-rest" name="rest" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="matchingExp"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvttemplate-ObjectTemplateExp" name="ObjectTemplateExp"
-      eSuperTypes="#T-qvttemplate-TemplateExp">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvttemplate-ObjectTemplateExp" name="ObjectTemplateExp" eSuperTypes="#T-qvttemplate-TemplateExp">
     <eOperations name="validatePartPropertyIsUnique" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="PartPropertyIsUnique"/>
@@ -102,14 +97,12 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-ObjectTemplateExp-part"
-        name="part" ordered="false" upperBound="-1" eType="#T-qvttemplate-PropertyTemplateItem"
-        containment="true" eOpposite="#F-qvttemplate-PropertyTemplateItem-objContainer"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-ObjectTemplateExp-referredClass"
-        name="referredClass" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Class"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-ObjectTemplateExp-part" name="part" ordered="false" upperBound="-1"
+        eType="#T-qvttemplate-PropertyTemplateItem" containment="true" eOpposite="#F-qvttemplate-PropertyTemplateItem-objContainer"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-ObjectTemplateExp-referredClass" name="referredClass" lowerBound="1"
+        eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Class"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvttemplate-PropertyTemplateItem"
-      name="PropertyTemplateItem" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ReferringElement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvttemplate-PropertyTemplateItem" name="PropertyTemplateItem" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Element ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ReferringElement">
     <eOperations name="validateCompatibleClassForProperty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="CompatibleClassForProperty"/>
@@ -170,35 +163,31 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-PropertyTemplateItem-objContainer"
-        name="objContainer" lowerBound="1" eType="#T-qvttemplate-ObjectTemplateExp"
-        transient="true" eOpposite="#F-qvttemplate-ObjectTemplateExp-part"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-PropertyTemplateItem-referredProperty"
-        name="referredProperty" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-PropertyTemplateItem-objContainer" name="objContainer" lowerBound="1"
+        eType="#T-qvttemplate-ObjectTemplateExp" transient="true" eOpposite="#F-qvttemplate-ObjectTemplateExp-part"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-PropertyTemplateItem-referredProperty" name="referredProperty"
+        lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="propertyItem"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-PropertyTemplateItem-value"
-        name="value" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-PropertyTemplateItem-value" name="value" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
         containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="propertyItem"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvttemplate-PropertyTemplateItem-isOpposite"
-        name="isOpposite" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-PropertyTemplateItem-resolvedProperty"
-        name="resolvedProperty" lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property"
-        changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" xmi:id="F-qvttemplate-PropertyTemplateItem-isOpposite" name="isOpposite" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-PropertyTemplateItem-resolvedProperty" name="resolvedProperty"
+        lowerBound="1" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Property" changeable="false" volatile="true"
+        transient="true" derived="true" resolveProxies="false">
       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
         <details key="derivation" value="&#xA;&#x9;if isOpposite then referredProperty.opposite else referredProperty endif&#xA;&#xA;"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvttemplate-TemplateExp" name="TemplateExp"
-      abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-LiteralExp ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ReferringElement">
+  <eClassifiers xsi:type="ecore:EClass" xmi:id="T-qvttemplate-TemplateExp" name="TemplateExp" abstract="true" eSuperTypes="../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-LiteralExp ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-ReferringElement">
     <eOperations name="validateWhereIsBoolean" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
       <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
         <details key="originalName" value="WhereIsBoolean"/>
@@ -214,14 +203,12 @@
         </eGenericType>
       </eParameters>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-TemplateExp-bindsTo"
-        name="bindsTo" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-TemplateExp-bindsTo" name="bindsTo" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-Variable">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="templateExp"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-TemplateExp-where"
-        name="where" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
+    <eStructuralFeatures xsi:type="ecore:EReference" xmi:id="F-qvttemplate-TemplateExp-where" name="where" eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#T-pivot-OCLExpression"
         containment="true">
       <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
         <details key="body" value="owner"/>
diff --git a/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.genmodel b/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.genmodel
index 9cb2a897e..c3c2ec77b 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.genmodel
+++ b/plugins/org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2017 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.qvtd.pivot.qvttemplate/emf-gen" modelPluginID="org.eclipse.qvtd.pivot.qvttemplate"
     modelName="QVTTemplate" modelPluginClass="" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.7" usedGenPackages="../../org.eclipse.ocl.pivot/model/Pivot.genmodel#//pivot"
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel
index 9854528c4..b42c594ae 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/model/QVTcoreCS.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2017 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.qvtd.xtext.qvtcore/emf-gen" modelPluginID="org.eclipse.qvtd.xtext.qvtcore"
     modelName="QVTcoreCS" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
     copyrightFields="false" runtimeVersion="2.7" usedGenPackages="../../org.eclipse.ocl.xtext.base/model/BaseCS.genmodel#//basecs ../../org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.genmodel#//essentialoclcs ../../org.eclipse.ocl.pivot/model/Pivot.genmodel#//pivot ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel#//qvtbase ../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.genmodel#//qvtcore ../../org.eclipse.qvtd.xtext.qvtbase/model/QVTbaseCS.genmodel#//qvtbasecs">
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/model/QVTimperativeCS.genmodel b/plugins/org.eclipse.qvtd.xtext.qvtimperative/model/QVTimperativeCS.genmodel
index 19b1155e2..7f7fc8240 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/model/QVTimperativeCS.genmodel
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/model/QVTimperativeCS.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2017 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.qvtd.xtext.qvtimperative/emf-gen" modelPluginID="org.eclipse.qvtd.xtext.qvtimperative"
     modelName="QVTimperativeCS" modelPluginClass="" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.7" usedGenPackages="../../org.eclipse.ocl.xtext.base/model/BaseCS.genmodel#//basecs ../../org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.genmodel#//essentialoclcs ../../org.eclipse.ocl.pivot/model/Pivot.genmodel#//pivot ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel#//qvtbase ../../org.eclipse.qvtd.pivot.qvtimperative/model/QVTimperative.genmodel#//qvtimperative ../../org.eclipse.qvtd.xtext.qvtbase/model/QVTbaseCS.genmodel#//qvtbasecs">
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.genmodel b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.genmodel
index 12882413e..82ba9b0ff 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.genmodel
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2017 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;&#xD;&#xA;Copyright (c) 2013, 2018 Willink Transformations and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  E.D.Willink - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"
     modelDirectory="/org.eclipse.qvtd.xtext.qvtrelation/emf-gen" modelPluginID="org.eclipse.qvtd.xtext.qvtrelation"
     modelName="QVTrelationCS" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
     copyrightFields="false" runtimeVersion="2.7" usedGenPackages="../../org.eclipse.ocl.xtext.base/model/BaseCS.genmodel#//basecs ../../org.eclipse.ocl.xtext.essentialocl/model/EssentialOCLCS.genmodel#//essentialoclcs ../../org.eclipse.ocl.pivot/model/Pivot.genmodel#//pivot ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.genmodel#//qvtbase ../../org.eclipse.qvtd.xtext.qvtbase/model/QVTbaseCS.genmodel#//qvtbasecs ../../org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.genmodel#//qvtrelation ../../org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.genmodel#//qvttemplate">
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2 b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2
index a9ad6982e..a8a1b681e 100644
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/mwe2/GenerateQVTdASModels.mwe2
@@ -137,7 +137,6 @@ Workflow {
     }
     bean = EcoreGenModelSetup { resourceSet = resourceSet2 }
  
-
     component = @SubGenerateASModel { resourceSet = resourceSet2
     	projectName = "org.eclipse.qvtd.pivot.qvtbase"
     	genModelFile =  "model/QVTbase.genmodel"