Regen with fewer warnings
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_ManualUML2RDBMS/ManualUML2RDBMS.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_ManualUML2RDBMS/ManualUML2RDBMS.java
index 8e4ca8c..4bd1321 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_ManualUML2RDBMS/ManualUML2RDBMS.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_ManualUML2RDBMS/ManualUML2RDBMS.java
@@ -932,6 +932,7 @@
                 collect = accumulator;
                 break;
             }
+            @SuppressWarnings("null")
             @NonNull /*@NonInvalid*/ NonLeafAttribute _1 = (NonLeafAttribute)ITERATOR__1.next();
             /**
              * fromAttributes
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_Tree2TallTree/Tree2TallTree.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_Tree2TallTree/Tree2TallTree.java
index 70ba6df..c361714 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_Tree2TallTree/Tree2TallTree.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_Tree2TallTree/Tree2TallTree.java
@@ -364,6 +364,7 @@
                     collect = accumulator;
                     break;
                 }
+                @SuppressWarnings("null")
                 @NonNull /*@NonInvalid*/ Node2TallNode _1 = (Node2TallNode)ITERATOR__1.next();
                 /**
                  * tallNode
@@ -404,6 +405,7 @@
                         collect_0 = accumulator_1;
                         break;
                     }
+                    @SuppressWarnings("null")
                     @NonNull /*@NonInvalid*/ TallNode _1_1 = (TallNode)ITERATOR__1_1.next();
                     /**
                      * height
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_classescs2as/classescs2as.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_classescs2as/classescs2as.java
index ab83ba6..c7d18e9 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_classescs2as/classescs2as.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/cg/_classescs2as/classescs2as.java
@@ -396,6 +396,7 @@
                 collect = accumulator_0;
                 break;
             }
+            @SuppressWarnings("null")
             @NonNull /*@NonInvalid*/ PackageCS2Package _1_0 = (PackageCS2Package)ITERATOR__1_0.next();
             /**
              * package
@@ -506,6 +507,7 @@
                 collect = accumulator_0;
                 break;
             }
+            @SuppressWarnings("null")
             @NonNull /*@NonInvalid*/ ClassCS2Class _1_0 = (ClassCS2Class)ITERATOR__1_0.next();
             /**
              * class
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiDomainUsageTests.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiDomainUsageTests.java
index 844318f..3879333 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiDomainUsageTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/QVTiDomainUsageTests.java
@@ -183,9 +183,9 @@
 		completeOCLEObjectValidator2.initialize();
 //		completeOCLEObjectValidator3.initialize();
 		PivotEObjectValidator.install(ClassUtil.nonNullState(asResource.getResourceSet()), myQVT.getEnvironmentFactory());
-		PivotEObjectValidator.install(ClassUtil.nonNullState(QVTbasePackage.eINSTANCE));
-		PivotEObjectValidator.install(ClassUtil.nonNullState(QVTcoreBasePackage.eINSTANCE));
-		PivotEObjectValidator.install(ClassUtil.nonNullState(QVTimperativePackage.eINSTANCE));
+		PivotEObjectValidator.install(ClassUtil.nonNullState(QVTbasePackage.eINSTANCE), null);
+		PivotEObjectValidator.install(ClassUtil.nonNullState(QVTcoreBasePackage.eINSTANCE), null);
+		PivotEObjectValidator.install(ClassUtil.nonNullState(QVTimperativePackage.eINSTANCE), null);
 	    
 		assertNoValidationErrors("Pivot validation errors", asResource.getContents().get(0));
 		asResource.save(getSaveOptions());