Applied Moritz' patch for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=256406 (Formatter)

119 files changed, 5717 insertions, 4938 deletions

diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java
index 0926b23..d08e01f 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-10 08:46:05
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-10 15:08:41
 
 package org.eclipse.xtext.reference.parser.internal;
 
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java
index 4527029..66fb94b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammarParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-10 08:46:05
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/internal/InternalReferenceGrammar.g 2008-12-10 15:08:41
 
 package org.eclipse.xtext.reference.parser.internal; 
 
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
index c56f216..148c92b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java
@@ -251,7 +251,7 @@ protected class Spielplatz_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prSpielplatz().ele001Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prSpielplatz().ele001KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -493,7 +493,7 @@ protected class Spielplatz_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prSpielplatz().ele1Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prSpielplatz().ele1KeywordRightCurlyBracket();
 	}	
 }
 
@@ -706,7 +706,7 @@ protected class Kind_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prKind().ele0001Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prKind().ele0001KeywordLeftParenthesis();
 	}	
 }
 
@@ -767,7 +767,7 @@ protected class Kind_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prKind().ele1Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prKind().ele1KeywordRightParenthesis();
 	}	
 }
 
@@ -913,7 +913,7 @@ protected class Erwachsener_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prErwachsener().ele0001Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prErwachsener().ele0001KeywordLeftParenthesis();
 	}	
 }
 
@@ -974,7 +974,7 @@ protected class Erwachsener_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prErwachsener().ele1Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prErwachsener().ele1KeywordRightParenthesis();
 	}	
 }
 
@@ -1120,7 +1120,7 @@ protected class Spielzeug_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prSpielzeug().ele0001Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prSpielzeug().ele0001KeywordLeftParenthesis();
 	}	
 }
 
@@ -1186,7 +1186,7 @@ protected class Spielzeug_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prSpielzeug().ele1Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prSpielzeug().ele1KeywordRightParenthesis();
 	}	
 }
 
@@ -1416,7 +1416,7 @@ protected class Familie_0_0_0_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prFamilie().ele0000001Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prFamilie().ele0000001KeywordLeftParenthesis();
 	}	
 }
 
@@ -1572,7 +1572,7 @@ protected class Familie_0_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prFamilie().ele010Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prFamilie().ele010KeywordComma();
 	}	
 }
 
@@ -1612,7 +1612,7 @@ protected class Familie_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarGrammarAccess.INSTANCE.prFamilie().ele1Keyword();
+		return ReferenceGrammarGrammarAccess.INSTANCE.prFamilie().ele1KeywordRightParenthesis();
 	}	
 }
 
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java
index 01d4679..25eed6b 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java
@@ -11,675 +11,459 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class SpielplatzElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Keyword c00000KeywordSpielplatz;
-		private Assignment c00001AssignmentGroesse;
-		private RuleCall c000010LexerRuleCallINT;
-		private Assignment c0001AssignmentBeschreibung;
-		private RuleCall c00010LexerRuleCallSTRING;
-		private Keyword c001Keyword;
-		private Alternatives c01Alternatives;
-		private Alternatives c010Alternatives;
-		private Alternatives c0100Alternatives;
-		private Alternatives c01000Alternatives;
-		private Assignment c010000AssignmentKinder;
-		private RuleCall c0100000ParserRuleCallKind;
-		private Assignment c010001AssignmentErzieher;
-		private RuleCall c0100010ParserRuleCallErwachsener;
-		private Assignment c01001AssignmentSpielzeuge;
-		private RuleCall c010010ParserRuleCallSpielzeug;
-		private Assignment c0101AssignmentFamilie;
-		private RuleCall c01010ParserRuleCallFamilie;
-		private Assignment c011AssignmentTypes;
-		private RuleCall c0110ParserRuleCallCustomTypeParserRule;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Keyword c00000KeywordSpielplatz = (Keyword)c0000Group.eContents().get(0);
+		private final Assignment c00001AssignmentGroesse = (Assignment)c0000Group.eContents().get(1);
+		private final RuleCall c000010LexerRuleCallINT = (RuleCall)c00001AssignmentGroesse.eContents().get(0);
+		private final Assignment c0001AssignmentBeschreibung = (Assignment)c000Group.eContents().get(1);
+		private final RuleCall c00010LexerRuleCallSTRING = (RuleCall)c0001AssignmentBeschreibung.eContents().get(0);
+		private final Keyword c001KeywordLeftCurlyBracket = (Keyword)c00Group.eContents().get(1);
+		private final Alternatives c01Alternatives = (Alternatives)c0Group.eContents().get(1);
+		private final Alternatives c010Alternatives = (Alternatives)c01Alternatives.eContents().get(0);
+		private final Alternatives c0100Alternatives = (Alternatives)c010Alternatives.eContents().get(0);
+		private final Alternatives c01000Alternatives = (Alternatives)c0100Alternatives.eContents().get(0);
+		private final Assignment c010000AssignmentKinder = (Assignment)c01000Alternatives.eContents().get(0);
+		private final RuleCall c0100000ParserRuleCallKind = (RuleCall)c010000AssignmentKinder.eContents().get(0);
+		private final Assignment c010001AssignmentErzieher = (Assignment)c01000Alternatives.eContents().get(1);
+		private final RuleCall c0100010ParserRuleCallErwachsener = (RuleCall)c010001AssignmentErzieher.eContents().get(0);
+		private final Assignment c01001AssignmentSpielzeuge = (Assignment)c0100Alternatives.eContents().get(1);
+		private final RuleCall c010010ParserRuleCallSpielzeug = (RuleCall)c01001AssignmentSpielzeuge.eContents().get(0);
+		private final Assignment c0101AssignmentFamilie = (Assignment)c010Alternatives.eContents().get(1);
+		private final RuleCall c01010ParserRuleCallFamilie = (RuleCall)c0101AssignmentFamilie.eContents().get(0);
+		private final Assignment c011AssignmentTypes = (Assignment)c01Alternatives.eContents().get(1);
+		private final RuleCall c0110ParserRuleCallCustomTypeParserRule = (RuleCall)c011AssignmentTypes.eContents().get(0);
+		private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
 		
 		// Spielplatz : ( 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * '}' ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) * '}' ) ?
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{'
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'spielplatz' groesse = INT ( beschreibung = STRING ) ?
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'spielplatz' groesse = INT
-		public Group ele0000Group() {
-			return (c0000Group != null) ? c0000Group : (c0000Group = (Group)ele000Group().eContents().get(0)); 
-		}
+		public Group ele0000Group() { return c0000Group; }
 
 		// 'spielplatz'
-		public Keyword ele00000KeywordSpielplatz() {
-			return (c00000KeywordSpielplatz != null) ? c00000KeywordSpielplatz : (c00000KeywordSpielplatz = (Keyword)ele0000Group().eContents().get(0)); 
-		}
+		public Keyword ele00000KeywordSpielplatz() { return c00000KeywordSpielplatz; }
 
 		// groesse = INT
-		public Assignment ele00001AssignmentGroesse() {
-			return (c00001AssignmentGroesse != null) ? c00001AssignmentGroesse : (c00001AssignmentGroesse = (Assignment)ele0000Group().eContents().get(1)); 
-		}
+		public Assignment ele00001AssignmentGroesse() { return c00001AssignmentGroesse; }
 
 		// INT
-		public RuleCall ele000010LexerRuleCallINT() {
-			return (c000010LexerRuleCallINT != null) ? c000010LexerRuleCallINT : (c000010LexerRuleCallINT = (RuleCall)ele00001AssignmentGroesse().eContents().get(0)); 
-		}
+		public RuleCall ele000010LexerRuleCallINT() { return c000010LexerRuleCallINT; }
 
 		// ( beschreibung = STRING ) ?
-		public Assignment ele0001AssignmentBeschreibung() {
-			return (c0001AssignmentBeschreibung != null) ? c0001AssignmentBeschreibung : (c0001AssignmentBeschreibung = (Assignment)ele000Group().eContents().get(1)); 
-		}
+		public Assignment ele0001AssignmentBeschreibung() { return c0001AssignmentBeschreibung; }
 
 		// STRING
-		public RuleCall ele00010LexerRuleCallSTRING() {
-			return (c00010LexerRuleCallSTRING != null) ? c00010LexerRuleCallSTRING : (c00010LexerRuleCallSTRING = (RuleCall)ele0001AssignmentBeschreibung().eContents().get(0)); 
-		}
+		public RuleCall ele00010LexerRuleCallSTRING() { return c00010LexerRuleCallSTRING; }
 
 		// '{'
-		public Keyword ele001Keyword() {
-			return (c001Keyword != null) ? c001Keyword : (c001Keyword = (Keyword)ele00Group().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; }
 
 		// ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie | types += CustomTypeParserRule ) *
-		public Alternatives ele01Alternatives() {
-			return (c01Alternatives != null) ? c01Alternatives : (c01Alternatives = (Alternatives)ele0Group().eContents().get(1)); 
-		}
+		public Alternatives ele01Alternatives() { return c01Alternatives; }
 
 		// kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie
-		public Alternatives ele010Alternatives() {
-			return (c010Alternatives != null) ? c010Alternatives : (c010Alternatives = (Alternatives)ele01Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele010Alternatives() { return c010Alternatives; }
 
 		// kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug
-		public Alternatives ele0100Alternatives() {
-			return (c0100Alternatives != null) ? c0100Alternatives : (c0100Alternatives = (Alternatives)ele010Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele0100Alternatives() { return c0100Alternatives; }
 
 		// kinder += Kind | erzieher += Erwachsener
-		public Alternatives ele01000Alternatives() {
-			return (c01000Alternatives != null) ? c01000Alternatives : (c01000Alternatives = (Alternatives)ele0100Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele01000Alternatives() { return c01000Alternatives; }
 
 		// kinder += Kind
-		public Assignment ele010000AssignmentKinder() {
-			return (c010000AssignmentKinder != null) ? c010000AssignmentKinder : (c010000AssignmentKinder = (Assignment)ele01000Alternatives().eContents().get(0)); 
-		}
+		public Assignment ele010000AssignmentKinder() { return c010000AssignmentKinder; }
 
 		// Kind
-		public RuleCall ele0100000ParserRuleCallKind() {
-			return (c0100000ParserRuleCallKind != null) ? c0100000ParserRuleCallKind : (c0100000ParserRuleCallKind = (RuleCall)ele010000AssignmentKinder().eContents().get(0)); 
-		}
+		public RuleCall ele0100000ParserRuleCallKind() { return c0100000ParserRuleCallKind; }
 
 		// erzieher += Erwachsener
-		public Assignment ele010001AssignmentErzieher() {
-			return (c010001AssignmentErzieher != null) ? c010001AssignmentErzieher : (c010001AssignmentErzieher = (Assignment)ele01000Alternatives().eContents().get(1)); 
-		}
+		public Assignment ele010001AssignmentErzieher() { return c010001AssignmentErzieher; }
 
 		// Erwachsener
-		public RuleCall ele0100010ParserRuleCallErwachsener() {
-			return (c0100010ParserRuleCallErwachsener != null) ? c0100010ParserRuleCallErwachsener : (c0100010ParserRuleCallErwachsener = (RuleCall)ele010001AssignmentErzieher().eContents().get(0)); 
-		}
+		public RuleCall ele0100010ParserRuleCallErwachsener() { return c0100010ParserRuleCallErwachsener; }
 
 		// spielzeuge += Spielzeug
-		public Assignment ele01001AssignmentSpielzeuge() {
-			return (c01001AssignmentSpielzeuge != null) ? c01001AssignmentSpielzeuge : (c01001AssignmentSpielzeuge = (Assignment)ele0100Alternatives().eContents().get(1)); 
-		}
+		public Assignment ele01001AssignmentSpielzeuge() { return c01001AssignmentSpielzeuge; }
 
 		// Spielzeug
-		public RuleCall ele010010ParserRuleCallSpielzeug() {
-			return (c010010ParserRuleCallSpielzeug != null) ? c010010ParserRuleCallSpielzeug : (c010010ParserRuleCallSpielzeug = (RuleCall)ele01001AssignmentSpielzeuge().eContents().get(0)); 
-		}
+		public RuleCall ele010010ParserRuleCallSpielzeug() { return c010010ParserRuleCallSpielzeug; }
 
 		// familie += Familie
-		public Assignment ele0101AssignmentFamilie() {
-			return (c0101AssignmentFamilie != null) ? c0101AssignmentFamilie : (c0101AssignmentFamilie = (Assignment)ele010Alternatives().eContents().get(1)); 
-		}
+		public Assignment ele0101AssignmentFamilie() { return c0101AssignmentFamilie; }
 
 		// Familie
-		public RuleCall ele01010ParserRuleCallFamilie() {
-			return (c01010ParserRuleCallFamilie != null) ? c01010ParserRuleCallFamilie : (c01010ParserRuleCallFamilie = (RuleCall)ele0101AssignmentFamilie().eContents().get(0)); 
-		}
+		public RuleCall ele01010ParserRuleCallFamilie() { return c01010ParserRuleCallFamilie; }
 
 		// types += CustomTypeParserRule
-		public Assignment ele011AssignmentTypes() {
-			return (c011AssignmentTypes != null) ? c011AssignmentTypes : (c011AssignmentTypes = (Assignment)ele01Alternatives().eContents().get(1)); 
-		}
+		public Assignment ele011AssignmentTypes() { return c011AssignmentTypes; }
 
 		// CustomTypeParserRule
-		public RuleCall ele0110ParserRuleCallCustomTypeParserRule() {
-			return (c0110ParserRuleCallCustomTypeParserRule != null) ? c0110ParserRuleCallCustomTypeParserRule : (c0110ParserRuleCallCustomTypeParserRule = (RuleCall)ele011AssignmentTypes().eContents().get(0)); 
-		}
+		public RuleCall ele0110ParserRuleCallCustomTypeParserRule() { return c0110ParserRuleCallCustomTypeParserRule; }
 
 		// '}'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
 	}
 
 	public class PersonElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private RuleCall c0ParserRuleCallKind;
-		private RuleCall c1ParserRuleCallErwachsener;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallKind = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall c1ParserRuleCallErwachsener = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// Person : Kind | Erwachsener ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// Kind | Erwachsener
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// Kind
-		public RuleCall ele0ParserRuleCallKind() {
-			return (c0ParserRuleCallKind != null) ? c0ParserRuleCallKind : (c0ParserRuleCallKind = (RuleCall)eleAlternatives().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallKind() { return c0ParserRuleCallKind; }
 
 		// Erwachsener
-		public RuleCall ele1ParserRuleCallErwachsener() {
-			return (c1ParserRuleCallErwachsener != null) ? c1ParserRuleCallErwachsener : (c1ParserRuleCallErwachsener = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallErwachsener() { return c1ParserRuleCallErwachsener; }
 	}
 
 	public class KindElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000KeywordKind;
-		private Keyword c0001Keyword;
-		private Assignment c001AssignmentName;
-		private RuleCall c0010LexerRuleCallID;
-		private Assignment c01AssignmentAge;
-		private RuleCall c010LexerRuleCallINT;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordKind = (Keyword)c000Group.eContents().get(0);
+		private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+		private final Assignment c01AssignmentAge = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0);
+		private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
 		
 		// Kind : 'kind' '(' name = ID age = INT ')' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'kind' '(' name = ID age = INT ')'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'kind' '(' name = ID age = INT
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'kind' '(' name = ID
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'kind' '('
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'kind'
-		public Keyword ele0000KeywordKind() {
-			return (c0000KeywordKind != null) ? c0000KeywordKind : (c0000KeywordKind = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordKind() { return c0000KeywordKind; }
 
 		// '('
-		public Keyword ele0001Keyword() {
-			return (c0001Keyword != null) ? c0001Keyword : (c0001Keyword = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordLeftParenthesis() { return c0001KeywordLeftParenthesis; }
 
 		// name = ID
-		public Assignment ele001AssignmentName() {
-			return (c001AssignmentName != null) ? c001AssignmentName : (c001AssignmentName = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentName() { return c001AssignmentName; }
 
 		// ID
-		public RuleCall ele0010LexerRuleCallID() {
-			return (c0010LexerRuleCallID != null) ? c0010LexerRuleCallID : (c0010LexerRuleCallID = (RuleCall)ele001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
 
 		// age = INT
-		public Assignment ele01AssignmentAge() {
-			return (c01AssignmentAge != null) ? c01AssignmentAge : (c01AssignmentAge = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentAge() { return c01AssignmentAge; }
 
 		// INT
-		public RuleCall ele010LexerRuleCallINT() {
-			return (c010LexerRuleCallINT != null) ? c010LexerRuleCallINT : (c010LexerRuleCallINT = (RuleCall)ele01AssignmentAge().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallINT() { return c010LexerRuleCallINT; }
 
 		// ')'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
 	}
 
 	public class ErwachsenerElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000KeywordErwachsener;
-		private Keyword c0001Keyword;
-		private Assignment c001AssignmentName;
-		private RuleCall c0010LexerRuleCallID;
-		private Assignment c01AssignmentAge;
-		private RuleCall c010LexerRuleCallINT;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(5);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordErwachsener = (Keyword)c000Group.eContents().get(0);
+		private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+		private final Assignment c01AssignmentAge = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0);
+		private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
 		
 		// Erwachsener : 'erwachsener' '(' name = ID age = INT ')' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(5)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'erwachsener' '(' name = ID age = INT ')'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'erwachsener' '(' name = ID age = INT
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'erwachsener' '(' name = ID
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'erwachsener' '('
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'erwachsener'
-		public Keyword ele0000KeywordErwachsener() {
-			return (c0000KeywordErwachsener != null) ? c0000KeywordErwachsener : (c0000KeywordErwachsener = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordErwachsener() { return c0000KeywordErwachsener; }
 
 		// '('
-		public Keyword ele0001Keyword() {
-			return (c0001Keyword != null) ? c0001Keyword : (c0001Keyword = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordLeftParenthesis() { return c0001KeywordLeftParenthesis; }
 
 		// name = ID
-		public Assignment ele001AssignmentName() {
-			return (c001AssignmentName != null) ? c001AssignmentName : (c001AssignmentName = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentName() { return c001AssignmentName; }
 
 		// ID
-		public RuleCall ele0010LexerRuleCallID() {
-			return (c0010LexerRuleCallID != null) ? c0010LexerRuleCallID : (c0010LexerRuleCallID = (RuleCall)ele001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
 
 		// age = INT
-		public Assignment ele01AssignmentAge() {
-			return (c01AssignmentAge != null) ? c01AssignmentAge : (c01AssignmentAge = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentAge() { return c01AssignmentAge; }
 
 		// INT
-		public RuleCall ele010LexerRuleCallINT() {
-			return (c010LexerRuleCallINT != null) ? c010LexerRuleCallINT : (c010LexerRuleCallINT = (RuleCall)ele01AssignmentAge().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallINT() { return c010LexerRuleCallINT; }
 
 		// ')'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
 	}
 
 	public class SpielzeugElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000KeywordSpielzeug;
-		private Keyword c0001Keyword;
-		private Assignment c001AssignmentName;
-		private RuleCall c0010LexerRuleCallID;
-		private Assignment c01AssignmentFarbe;
-		private RuleCall c010ParserRuleCallFarbe;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(6);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordSpielzeug = (Keyword)c000Group.eContents().get(0);
+		private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+		private final Assignment c01AssignmentFarbe = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallFarbe = (RuleCall)c01AssignmentFarbe.eContents().get(0);
+		private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
 		
 		// Spielzeug : 'spielzeug' '(' name = ID farbe = Farbe ')' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(6)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'spielzeug' '(' name = ID farbe = Farbe ')'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'spielzeug' '(' name = ID farbe = Farbe
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'spielzeug' '(' name = ID
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'spielzeug' '('
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'spielzeug'
-		public Keyword ele0000KeywordSpielzeug() {
-			return (c0000KeywordSpielzeug != null) ? c0000KeywordSpielzeug : (c0000KeywordSpielzeug = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordSpielzeug() { return c0000KeywordSpielzeug; }
 
 		// '('
-		public Keyword ele0001Keyword() {
-			return (c0001Keyword != null) ? c0001Keyword : (c0001Keyword = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordLeftParenthesis() { return c0001KeywordLeftParenthesis; }
 
 		// name = ID
-		public Assignment ele001AssignmentName() {
-			return (c001AssignmentName != null) ? c001AssignmentName : (c001AssignmentName = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentName() { return c001AssignmentName; }
 
 		// ID
-		public RuleCall ele0010LexerRuleCallID() {
-			return (c0010LexerRuleCallID != null) ? c0010LexerRuleCallID : (c0010LexerRuleCallID = (RuleCall)ele001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
 
 		// farbe = Farbe
-		public Assignment ele01AssignmentFarbe() {
-			return (c01AssignmentFarbe != null) ? c01AssignmentFarbe : (c01AssignmentFarbe = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentFarbe() { return c01AssignmentFarbe; }
 
 		// Farbe
-		public RuleCall ele010ParserRuleCallFarbe() {
-			return (c010ParserRuleCallFarbe != null) ? c010ParserRuleCallFarbe : (c010ParserRuleCallFarbe = (RuleCall)ele01AssignmentFarbe().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallFarbe() { return c010ParserRuleCallFarbe; }
 
 		// ')'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
 	}
 
 	public class FamilieElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Group c00000Group;
-		private Group c000000Group;
-		private Keyword c0000000KeywordFamilie;
-		private Keyword c0000001Keyword;
-		private Assignment c000001AssignmentName;
-		private Alternatives c0000010Alternatives;
-		private Alternatives c00000100Alternatives;
-		private Keyword c000001000KeywordKeyword;
-		private RuleCall c000001001LexerRuleCallSTRING;
-		private RuleCall c00000101LexerRuleCallID;
-		private Assignment c00001AssignmentMutter;
-		private CrossReference c000010CrossReferenceErwachsener;
-		private Assignment c0001AssignmentVater;
-		private CrossReference c00010CrossReferenceErwachsener;
-		private Assignment c001AssignmentKinder;
-		private CrossReference c0010CrossReferenceKind;
-		private Group c01Group;
-		private Keyword c010Keyword;
-		private Assignment c011AssignmentKinder;
-		private CrossReference c0110CrossReferenceKind;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(7);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Group c00000Group = (Group)c0000Group.eContents().get(0);
+		private final Group c000000Group = (Group)c00000Group.eContents().get(0);
+		private final Keyword c0000000KeywordFamilie = (Keyword)c000000Group.eContents().get(0);
+		private final Keyword c0000001KeywordLeftParenthesis = (Keyword)c000000Group.eContents().get(1);
+		private final Assignment c000001AssignmentName = (Assignment)c00000Group.eContents().get(1);
+		private final Alternatives c0000010Alternatives = (Alternatives)c000001AssignmentName.eContents().get(0);
+		private final Alternatives c00000100Alternatives = (Alternatives)c0000010Alternatives.eContents().get(0);
+		private final Keyword c000001000KeywordKeyword = (Keyword)c00000100Alternatives.eContents().get(0);
+		private final RuleCall c000001001LexerRuleCallSTRING = (RuleCall)c00000100Alternatives.eContents().get(1);
+		private final RuleCall c00000101LexerRuleCallID = (RuleCall)c0000010Alternatives.eContents().get(1);
+		private final Assignment c00001AssignmentMutter = (Assignment)c0000Group.eContents().get(1);
+		private final CrossReference c000010CrossReferenceErwachsener = (CrossReference)c00001AssignmentMutter.eContents().get(0);
+		private final Assignment c0001AssignmentVater = (Assignment)c000Group.eContents().get(1);
+		private final CrossReference c00010CrossReferenceErwachsener = (CrossReference)c0001AssignmentVater.eContents().get(0);
+		private final Assignment c001AssignmentKinder = (Assignment)c00Group.eContents().get(1);
+		private final CrossReference c0010CrossReferenceKind = (CrossReference)c001AssignmentKinder.eContents().get(0);
+		private final Group c01Group = (Group)c0Group.eContents().get(1);
+		private final Keyword c010KeywordComma = (Keyword)c01Group.eContents().get(0);
+		private final Assignment c011AssignmentKinder = (Assignment)c01Group.eContents().get(1);
+		private final CrossReference c0110CrossReferenceKind = (CrossReference)c011AssignmentKinder.eContents().get(0);
+		private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
 		
 		// Familie : 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(7)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) * ')'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ] ( ',' kinder += [ Kind ] ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ] kinder += [ Kind ]
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ] vater = [ Erwachsener ]
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'familie' '(' name = ( 'keyword' | STRING | ID ) mutter = [ Erwachsener ]
-		public Group ele0000Group() {
-			return (c0000Group != null) ? c0000Group : (c0000Group = (Group)ele000Group().eContents().get(0)); 
-		}
+		public Group ele0000Group() { return c0000Group; }
 
 		// 'familie' '(' name = ( 'keyword' | STRING | ID )
-		public Group ele00000Group() {
-			return (c00000Group != null) ? c00000Group : (c00000Group = (Group)ele0000Group().eContents().get(0)); 
-		}
+		public Group ele00000Group() { return c00000Group; }
 
 		// 'familie' '('
-		public Group ele000000Group() {
-			return (c000000Group != null) ? c000000Group : (c000000Group = (Group)ele00000Group().eContents().get(0)); 
-		}
+		public Group ele000000Group() { return c000000Group; }
 
 		// 'familie'
-		public Keyword ele0000000KeywordFamilie() {
-			return (c0000000KeywordFamilie != null) ? c0000000KeywordFamilie : (c0000000KeywordFamilie = (Keyword)ele000000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000000KeywordFamilie() { return c0000000KeywordFamilie; }
 
 		// '('
-		public Keyword ele0000001Keyword() {
-			return (c0000001Keyword != null) ? c0000001Keyword : (c0000001Keyword = (Keyword)ele000000Group().eContents().get(1)); 
-		}
+		public Keyword ele0000001KeywordLeftParenthesis() { return c0000001KeywordLeftParenthesis; }
 
 		// name = ( 'keyword' | STRING | ID )
-		public Assignment ele000001AssignmentName() {
-			return (c000001AssignmentName != null) ? c000001AssignmentName : (c000001AssignmentName = (Assignment)ele00000Group().eContents().get(1)); 
-		}
+		public Assignment ele000001AssignmentName() { return c000001AssignmentName; }
 
 		// 'keyword' | STRING | ID
-		public Alternatives ele0000010Alternatives() {
-			return (c0000010Alternatives != null) ? c0000010Alternatives : (c0000010Alternatives = (Alternatives)ele000001AssignmentName().eContents().get(0)); 
-		}
+		public Alternatives ele0000010Alternatives() { return c0000010Alternatives; }
 
 		// 'keyword' | STRING
-		public Alternatives ele00000100Alternatives() {
-			return (c00000100Alternatives != null) ? c00000100Alternatives : (c00000100Alternatives = (Alternatives)ele0000010Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele00000100Alternatives() { return c00000100Alternatives; }
 
 		// 'keyword'
-		public Keyword ele000001000KeywordKeyword() {
-			return (c000001000KeywordKeyword != null) ? c000001000KeywordKeyword : (c000001000KeywordKeyword = (Keyword)ele00000100Alternatives().eContents().get(0)); 
-		}
+		public Keyword ele000001000KeywordKeyword() { return c000001000KeywordKeyword; }
 
 		// STRING
-		public RuleCall ele000001001LexerRuleCallSTRING() {
-			return (c000001001LexerRuleCallSTRING != null) ? c000001001LexerRuleCallSTRING : (c000001001LexerRuleCallSTRING = (RuleCall)ele00000100Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele000001001LexerRuleCallSTRING() { return c000001001LexerRuleCallSTRING; }
 
 		// ID
-		public RuleCall ele00000101LexerRuleCallID() {
-			return (c00000101LexerRuleCallID != null) ? c00000101LexerRuleCallID : (c00000101LexerRuleCallID = (RuleCall)ele0000010Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele00000101LexerRuleCallID() { return c00000101LexerRuleCallID; }
 
 		// mutter = [ Erwachsener ]
-		public Assignment ele00001AssignmentMutter() {
-			return (c00001AssignmentMutter != null) ? c00001AssignmentMutter : (c00001AssignmentMutter = (Assignment)ele0000Group().eContents().get(1)); 
-		}
+		public Assignment ele00001AssignmentMutter() { return c00001AssignmentMutter; }
 
 		// [ Erwachsener ]
-		public CrossReference ele000010CrossReferenceErwachsener() {
-			return (c000010CrossReferenceErwachsener != null) ? c000010CrossReferenceErwachsener : (c000010CrossReferenceErwachsener = (CrossReference)ele00001AssignmentMutter().eContents().get(0)); 
-		}
+		public CrossReference ele000010CrossReferenceErwachsener() { return c000010CrossReferenceErwachsener; }
 
 		// vater = [ Erwachsener ]
-		public Assignment ele0001AssignmentVater() {
-			return (c0001AssignmentVater != null) ? c0001AssignmentVater : (c0001AssignmentVater = (Assignment)ele000Group().eContents().get(1)); 
-		}
+		public Assignment ele0001AssignmentVater() { return c0001AssignmentVater; }
 
 		// [ Erwachsener ]
-		public CrossReference ele00010CrossReferenceErwachsener() {
-			return (c00010CrossReferenceErwachsener != null) ? c00010CrossReferenceErwachsener : (c00010CrossReferenceErwachsener = (CrossReference)ele0001AssignmentVater().eContents().get(0)); 
-		}
+		public CrossReference ele00010CrossReferenceErwachsener() { return c00010CrossReferenceErwachsener; }
 
 		// kinder += [ Kind ]
-		public Assignment ele001AssignmentKinder() {
-			return (c001AssignmentKinder != null) ? c001AssignmentKinder : (c001AssignmentKinder = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentKinder() { return c001AssignmentKinder; }
 
 		// [ Kind ]
-		public CrossReference ele0010CrossReferenceKind() {
-			return (c0010CrossReferenceKind != null) ? c0010CrossReferenceKind : (c0010CrossReferenceKind = (CrossReference)ele001AssignmentKinder().eContents().get(0)); 
-		}
+		public CrossReference ele0010CrossReferenceKind() { return c0010CrossReferenceKind; }
 
 		// ( ',' kinder += [ Kind ] ) *
-		public Group ele01Group() {
-			return (c01Group != null) ? c01Group : (c01Group = (Group)ele0Group().eContents().get(1)); 
-		}
+		public Group ele01Group() { return c01Group; }
 
 		// ','
-		public Keyword ele010Keyword() {
-			return (c010Keyword != null) ? c010Keyword : (c010Keyword = (Keyword)ele01Group().eContents().get(0)); 
-		}
+		public Keyword ele010KeywordComma() { return c010KeywordComma; }
 
 		// kinder += [ Kind ]
-		public Assignment ele011AssignmentKinder() {
-			return (c011AssignmentKinder != null) ? c011AssignmentKinder : (c011AssignmentKinder = (Assignment)ele01Group().eContents().get(1)); 
-		}
+		public Assignment ele011AssignmentKinder() { return c011AssignmentKinder; }
 
 		// [ Kind ]
-		public CrossReference ele0110CrossReferenceKind() {
-			return (c0110CrossReferenceKind != null) ? c0110CrossReferenceKind : (c0110CrossReferenceKind = (CrossReference)ele011AssignmentKinder().eContents().get(0)); 
-		}
+		public CrossReference ele0110CrossReferenceKind() { return c0110CrossReferenceKind; }
 
 		// ')'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
 	}
 
 	public class FarbeElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentWert;
-		private Alternatives c0Alternatives;
-		private Alternatives c00Alternatives;
-		private Alternatives c000Alternatives;
-		private Keyword c0000KeywordROT;
-		private Keyword c0001KeywordBLAU;
-		private Keyword c001KeywordGELB;
-		private Keyword c01KeywordGRÜN;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(8);
+		private final Assignment cAssignmentWert = (Assignment)rule.eContents().get(1);
+		private final Alternatives c0Alternatives = (Alternatives)cAssignmentWert.eContents().get(0);
+		private final Alternatives c00Alternatives = (Alternatives)c0Alternatives.eContents().get(0);
+		private final Alternatives c000Alternatives = (Alternatives)c00Alternatives.eContents().get(0);
+		private final Keyword c0000KeywordROT = (Keyword)c000Alternatives.eContents().get(0);
+		private final Keyword c0001KeywordBLAU = (Keyword)c000Alternatives.eContents().get(1);
+		private final Keyword c001KeywordGELB = (Keyword)c00Alternatives.eContents().get(1);
+		private final Keyword c01KeywordGRÜN = (Keyword)c0Alternatives.eContents().get(1);
 		
 		// Farbe : wert = ( 'ROT' | 'BLAU' | 'GELB' | 'GRÜN' ) ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(8)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// wert = ( 'ROT' | 'BLAU' | 'GELB' | 'GRÜN' )
-		public Assignment eleAssignmentWert() {
-			return (cAssignmentWert != null) ? cAssignmentWert : (cAssignmentWert = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentWert() { return cAssignmentWert; }
 
 		// 'ROT' | 'BLAU' | 'GELB' | 'GRÜN'
-		public Alternatives ele0Alternatives() {
-			return (c0Alternatives != null) ? c0Alternatives : (c0Alternatives = (Alternatives)eleAssignmentWert().eContents().get(0)); 
-		}
+		public Alternatives ele0Alternatives() { return c0Alternatives; }
 
 		// 'ROT' | 'BLAU' | 'GELB'
-		public Alternatives ele00Alternatives() {
-			return (c00Alternatives != null) ? c00Alternatives : (c00Alternatives = (Alternatives)ele0Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele00Alternatives() { return c00Alternatives; }
 
 		// 'ROT' | 'BLAU'
-		public Alternatives ele000Alternatives() {
-			return (c000Alternatives != null) ? c000Alternatives : (c000Alternatives = (Alternatives)ele00Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele000Alternatives() { return c000Alternatives; }
 
 		// 'ROT'
-		public Keyword ele0000KeywordROT() {
-			return (c0000KeywordROT != null) ? c0000KeywordROT : (c0000KeywordROT = (Keyword)ele000Alternatives().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordROT() { return c0000KeywordROT; }
 
 		// 'BLAU'
-		public Keyword ele0001KeywordBLAU() {
-			return (c0001KeywordBLAU != null) ? c0001KeywordBLAU : (c0001KeywordBLAU = (Keyword)ele000Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordBLAU() { return c0001KeywordBLAU; }
 
 		// 'GELB'
-		public Keyword ele001KeywordGELB() {
-			return (c001KeywordGELB != null) ? c001KeywordGELB : (c001KeywordGELB = (Keyword)ele00Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordGELB() { return c001KeywordGELB; }
 
 		// 'GRÜN'
-		public Keyword ele01KeywordGRÜN() {
-			return (c01KeywordGRÜN != null) ? c01KeywordGRÜN : (c01KeywordGRÜN = (Keyword)ele0Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordGRÜN() { return c01KeywordGRÜN; }
 	}
 
 	public class CustomTypeParserRuleElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Keyword c0KeywordType;
-		private Assignment c1AssignmentName;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(9);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordType = (Keyword)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
 		
 		// CustomTypeParserRule returns CustomType : 'type' name = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(9)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'type' name = ID
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'type'
-		public Keyword ele0KeywordType() {
-			return (c0KeywordType != null) ? c0KeywordType : (c0KeywordType = (Keyword)eleGroup().eContents().get(0)); 
-		}
+		public Keyword ele0KeywordType() { return c0KeywordType; }
 
 		// name = ID
-		public Assignment ele1AssignmentName() {
-			return (c1AssignmentName != null) ? c1AssignmentName : (c1AssignmentName = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentName() { return c1AssignmentName; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 	
 	public final static ReferenceGrammarGrammarAccess INSTANCE = new ReferenceGrammarGrammarAccess();
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java
index ae4ff97..437aa01 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-10 08:45:46
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-10 15:08:46
 
 package org.eclipse.xtext.example.parser.internal;
 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java
index 19ec438..92ce900 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDslParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-10 08:45:46
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/internal/InternalFowlerDsl.g 2008-12-10 15:08:46
 
 package org.eclipse.xtext.example.parser.internal; 
 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java
index b2375f9..c9a36e6 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java
@@ -827,7 +827,7 @@ protected class State_0_0_1_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return FowlerDslGrammarAccess.INSTANCE.prState().ele001001Keyword();
+		return FowlerDslGrammarAccess.INSTANCE.prState().ele001001KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -867,7 +867,7 @@ protected class State_0_0_1_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return FowlerDslGrammarAccess.INSTANCE.prState().ele0011Keyword();
+		return FowlerDslGrammarAccess.INSTANCE.prState().ele0011KeywordRightCurlyBracket();
 	}	
 }
 
@@ -1014,7 +1014,7 @@ protected class Transition_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return FowlerDslGrammarAccess.INSTANCE.prTransition().ele01Keyword();
+		return FowlerDslGrammarAccess.INSTANCE.prTransition().ele01KeywordEqualsSignGreaterThanSign();
 	}	
 }
 
diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java
index 4c101bf..e900f6a 100644
--- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java
+++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java
@@ -11,372 +11,254 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class StatemachineElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Group c00000Group;
-		private Keyword c000000KeywordEvents;
-		private Assignment c000001AssignmentEvents;
-		private RuleCall c0000010ParserRuleCallEvent;
-		private Keyword c00001KeywordEnd;
-		private Keyword c0001KeywordCommands;
-		private Assignment c001AssignmentCommands;
-		private RuleCall c0010ParserRuleCallCommand;
-		private Keyword c01KeywordEnd;
-		private Assignment c1AssignmentStates;
-		private RuleCall c10ParserRuleCallState;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Group c00000Group = (Group)c0000Group.eContents().get(0);
+		private final Keyword c000000KeywordEvents = (Keyword)c00000Group.eContents().get(0);
+		private final Assignment c000001AssignmentEvents = (Assignment)c00000Group.eContents().get(1);
+		private final RuleCall c0000010ParserRuleCallEvent = (RuleCall)c000001AssignmentEvents.eContents().get(0);
+		private final Keyword c00001KeywordEnd = (Keyword)c0000Group.eContents().get(1);
+		private final Keyword c0001KeywordCommands = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentCommands = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010ParserRuleCallCommand = (RuleCall)c001AssignmentCommands.eContents().get(0);
+		private final Keyword c01KeywordEnd = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentStates = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallState = (RuleCall)c1AssignmentStates.eContents().get(0);
 		
 		// Statemachine : 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end' ( states += State ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end' ( states += State ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) *
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'events' ( events += Event ) * 'end' 'commands'
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'events' ( events += Event ) * 'end'
-		public Group ele0000Group() {
-			return (c0000Group != null) ? c0000Group : (c0000Group = (Group)ele000Group().eContents().get(0)); 
-		}
+		public Group ele0000Group() { return c0000Group; }
 
 		// 'events' ( events += Event ) *
-		public Group ele00000Group() {
-			return (c00000Group != null) ? c00000Group : (c00000Group = (Group)ele0000Group().eContents().get(0)); 
-		}
+		public Group ele00000Group() { return c00000Group; }
 
 		// 'events'
-		public Keyword ele000000KeywordEvents() {
-			return (c000000KeywordEvents != null) ? c000000KeywordEvents : (c000000KeywordEvents = (Keyword)ele00000Group().eContents().get(0)); 
-		}
+		public Keyword ele000000KeywordEvents() { return c000000KeywordEvents; }
 
 		// ( events += Event ) *
-		public Assignment ele000001AssignmentEvents() {
-			return (c000001AssignmentEvents != null) ? c000001AssignmentEvents : (c000001AssignmentEvents = (Assignment)ele00000Group().eContents().get(1)); 
-		}
+		public Assignment ele000001AssignmentEvents() { return c000001AssignmentEvents; }
 
 		// Event
-		public RuleCall ele0000010ParserRuleCallEvent() {
-			return (c0000010ParserRuleCallEvent != null) ? c0000010ParserRuleCallEvent : (c0000010ParserRuleCallEvent = (RuleCall)ele000001AssignmentEvents().eContents().get(0)); 
-		}
+		public RuleCall ele0000010ParserRuleCallEvent() { return c0000010ParserRuleCallEvent; }
 
 		// 'end'
-		public Keyword ele00001KeywordEnd() {
-			return (c00001KeywordEnd != null) ? c00001KeywordEnd : (c00001KeywordEnd = (Keyword)ele0000Group().eContents().get(1)); 
-		}
+		public Keyword ele00001KeywordEnd() { return c00001KeywordEnd; }
 
 		// 'commands'
-		public Keyword ele0001KeywordCommands() {
-			return (c0001KeywordCommands != null) ? c0001KeywordCommands : (c0001KeywordCommands = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordCommands() { return c0001KeywordCommands; }
 
 		// ( commands += Command ) *
-		public Assignment ele001AssignmentCommands() {
-			return (c001AssignmentCommands != null) ? c001AssignmentCommands : (c001AssignmentCommands = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentCommands() { return c001AssignmentCommands; }
 
 		// Command
-		public RuleCall ele0010ParserRuleCallCommand() {
-			return (c0010ParserRuleCallCommand != null) ? c0010ParserRuleCallCommand : (c0010ParserRuleCallCommand = (RuleCall)ele001AssignmentCommands().eContents().get(0)); 
-		}
+		public RuleCall ele0010ParserRuleCallCommand() { return c0010ParserRuleCallCommand; }
 
 		// 'end'
-		public Keyword ele01KeywordEnd() {
-			return (c01KeywordEnd != null) ? c01KeywordEnd : (c01KeywordEnd = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordEnd() { return c01KeywordEnd; }
 
 		// ( states += State ) *
-		public Assignment ele1AssignmentStates() {
-			return (c1AssignmentStates != null) ? c1AssignmentStates : (c1AssignmentStates = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentStates() { return c1AssignmentStates; }
 
 		// State
-		public RuleCall ele10ParserRuleCallState() {
-			return (c10ParserRuleCallState != null) ? c10ParserRuleCallState : (c10ParserRuleCallState = (RuleCall)ele1AssignmentStates().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallState() { return c10ParserRuleCallState; }
 	}
 
 	public class EventElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Assignment c00AssignmentResetting;
-		private Keyword c000KeywordResetting;
-		private Assignment c01AssignmentName;
-		private RuleCall c010LexerRuleCallID;
-		private Assignment c1AssignmentCode;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Assignment c00AssignmentResetting = (Assignment)c0Group.eContents().get(0);
+		private final Keyword c000KeywordResetting = (Keyword)c00AssignmentResetting.eContents().get(0);
+		private final Assignment c01AssignmentName = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallID = (RuleCall)c01AssignmentName.eContents().get(0);
+		private final Assignment c1AssignmentCode = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentCode.eContents().get(0);
 		
 		// Event : ( resetting ?= 'resetting' ) ? name = ID code = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( resetting ?= 'resetting' ) ? name = ID code = ID
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// ( resetting ?= 'resetting' ) ? name = ID
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// ( resetting ?= 'resetting' ) ?
-		public Assignment ele00AssignmentResetting() {
-			return (c00AssignmentResetting != null) ? c00AssignmentResetting : (c00AssignmentResetting = (Assignment)ele0Group().eContents().get(0)); 
-		}
+		public Assignment ele00AssignmentResetting() { return c00AssignmentResetting; }
 
 		// 'resetting'
-		public Keyword ele000KeywordResetting() {
-			return (c000KeywordResetting != null) ? c000KeywordResetting : (c000KeywordResetting = (Keyword)ele00AssignmentResetting().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordResetting() { return c000KeywordResetting; }
 
 		// name = ID
-		public Assignment ele01AssignmentName() {
-			return (c01AssignmentName != null) ? c01AssignmentName : (c01AssignmentName = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentName() { return c01AssignmentName; }
 
 		// ID
-		public RuleCall ele010LexerRuleCallID() {
-			return (c010LexerRuleCallID != null) ? c010LexerRuleCallID : (c010LexerRuleCallID = (RuleCall)ele01AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallID() { return c010LexerRuleCallID; }
 
 		// code = ID
-		public Assignment ele1AssignmentCode() {
-			return (c1AssignmentCode != null) ? c1AssignmentCode : (c1AssignmentCode = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentCode() { return c1AssignmentCode; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentCode().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 
 	public class CommandElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Assignment c0AssignmentName;
-		private RuleCall c00LexerRuleCallID;
-		private Assignment c1AssignmentCode;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Assignment c0AssignmentName = (Assignment)cGroup.eContents().get(0);
+		private final RuleCall c00LexerRuleCallID = (RuleCall)c0AssignmentName.eContents().get(0);
+		private final Assignment c1AssignmentCode = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentCode.eContents().get(0);
 		
 		// Command : name = ID code = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID code = ID
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// name = ID
-		public Assignment ele0AssignmentName() {
-			return (c0AssignmentName != null) ? c0AssignmentName : (c0AssignmentName = (Assignment)eleGroup().eContents().get(0)); 
-		}
+		public Assignment ele0AssignmentName() { return c0AssignmentName; }
 
 		// ID
-		public RuleCall ele00LexerRuleCallID() {
-			return (c00LexerRuleCallID != null) ? c00LexerRuleCallID : (c00LexerRuleCallID = (RuleCall)ele0AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00LexerRuleCallID() { return c00LexerRuleCallID; }
 
 		// code = ID
-		public Assignment ele1AssignmentCode() {
-			return (c1AssignmentCode != null) ? c1AssignmentCode : (c1AssignmentCode = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentCode() { return c1AssignmentCode; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentCode().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 
 	public class StateElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000KeywordState;
-		private Assignment c0001AssignmentName;
-		private RuleCall c00010LexerRuleCallID;
-		private Group c001Group;
-		private Group c0010Group;
-		private Group c00100Group;
-		private Keyword c001000KeywordActions;
-		private Keyword c001001Keyword;
-		private Assignment c00101AssignmentActions;
-		private CrossReference c001010CrossReferenceCommand;
-		private Keyword c0011Keyword;
-		private Assignment c01AssignmentTransitions;
-		private RuleCall c010ParserRuleCallTransition;
-		private Keyword c1KeywordEnd;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordState = (Keyword)c000Group.eContents().get(0);
+		private final Assignment c0001AssignmentName = (Assignment)c000Group.eContents().get(1);
+		private final RuleCall c00010LexerRuleCallID = (RuleCall)c0001AssignmentName.eContents().get(0);
+		private final Group c001Group = (Group)c00Group.eContents().get(1);
+		private final Group c0010Group = (Group)c001Group.eContents().get(0);
+		private final Group c00100Group = (Group)c0010Group.eContents().get(0);
+		private final Keyword c001000KeywordActions = (Keyword)c00100Group.eContents().get(0);
+		private final Keyword c001001KeywordLeftCurlyBracket = (Keyword)c00100Group.eContents().get(1);
+		private final Assignment c00101AssignmentActions = (Assignment)c0010Group.eContents().get(1);
+		private final CrossReference c001010CrossReferenceCommand = (CrossReference)c00101AssignmentActions.eContents().get(0);
+		private final Keyword c0011KeywordRightCurlyBracket = (Keyword)c001Group.eContents().get(1);
+		private final Assignment c01AssignmentTransitions = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallTransition = (RuleCall)c01AssignmentTransitions.eContents().get(0);
+		private final Keyword c1KeywordEnd = (Keyword)cGroup.eContents().get(1);
 		
 		// State : 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'state' name = ID
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'state'
-		public Keyword ele0000KeywordState() {
-			return (c0000KeywordState != null) ? c0000KeywordState : (c0000KeywordState = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordState() { return c0000KeywordState; }
 
 		// name = ID
-		public Assignment ele0001AssignmentName() {
-			return (c0001AssignmentName != null) ? c0001AssignmentName : (c0001AssignmentName = (Assignment)ele000Group().eContents().get(1)); 
-		}
+		public Assignment ele0001AssignmentName() { return c0001AssignmentName; }
 
 		// ID
-		public RuleCall ele00010LexerRuleCallID() {
-			return (c00010LexerRuleCallID != null) ? c00010LexerRuleCallID : (c00010LexerRuleCallID = (RuleCall)ele0001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00010LexerRuleCallID() { return c00010LexerRuleCallID; }
 
 		// ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
-		public Group ele001Group() {
-			return (c001Group != null) ? c001Group : (c001Group = (Group)ele00Group().eContents().get(1)); 
-		}
+		public Group ele001Group() { return c001Group; }
 
 		// 'actions' '{' ( actions += [ Command ] ) +
-		public Group ele0010Group() {
-			return (c0010Group != null) ? c0010Group : (c0010Group = (Group)ele001Group().eContents().get(0)); 
-		}
+		public Group ele0010Group() { return c0010Group; }
 
 		// 'actions' '{'
-		public Group ele00100Group() {
-			return (c00100Group != null) ? c00100Group : (c00100Group = (Group)ele0010Group().eContents().get(0)); 
-		}
+		public Group ele00100Group() { return c00100Group; }
 
 		// 'actions'
-		public Keyword ele001000KeywordActions() {
-			return (c001000KeywordActions != null) ? c001000KeywordActions : (c001000KeywordActions = (Keyword)ele00100Group().eContents().get(0)); 
-		}
+		public Keyword ele001000KeywordActions() { return c001000KeywordActions; }
 
 		// '{'
-		public Keyword ele001001Keyword() {
-			return (c001001Keyword != null) ? c001001Keyword : (c001001Keyword = (Keyword)ele00100Group().eContents().get(1)); 
-		}
+		public Keyword ele001001KeywordLeftCurlyBracket() { return c001001KeywordLeftCurlyBracket; }
 
 		// ( actions += [ Command ] ) +
-		public Assignment ele00101AssignmentActions() {
-			return (c00101AssignmentActions != null) ? c00101AssignmentActions : (c00101AssignmentActions = (Assignment)ele0010Group().eContents().get(1)); 
-		}
+		public Assignment ele00101AssignmentActions() { return c00101AssignmentActions; }
 
 		// [ Command ]
-		public CrossReference ele001010CrossReferenceCommand() {
-			return (c001010CrossReferenceCommand != null) ? c001010CrossReferenceCommand : (c001010CrossReferenceCommand = (CrossReference)ele00101AssignmentActions().eContents().get(0)); 
-		}
+		public CrossReference ele001010CrossReferenceCommand() { return c001010CrossReferenceCommand; }
 
 		// '}'
-		public Keyword ele0011Keyword() {
-			return (c0011Keyword != null) ? c0011Keyword : (c0011Keyword = (Keyword)ele001Group().eContents().get(1)); 
-		}
+		public Keyword ele0011KeywordRightCurlyBracket() { return c0011KeywordRightCurlyBracket; }
 
 		// ( transitions += Transition ) *
-		public Assignment ele01AssignmentTransitions() {
-			return (c01AssignmentTransitions != null) ? c01AssignmentTransitions : (c01AssignmentTransitions = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentTransitions() { return c01AssignmentTransitions; }
 
 		// Transition
-		public RuleCall ele010ParserRuleCallTransition() {
-			return (c010ParserRuleCallTransition != null) ? c010ParserRuleCallTransition : (c010ParserRuleCallTransition = (RuleCall)ele01AssignmentTransitions().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallTransition() { return c010ParserRuleCallTransition; }
 
 		// 'end'
-		public Keyword ele1KeywordEnd() {
-			return (c1KeywordEnd != null) ? c1KeywordEnd : (c1KeywordEnd = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordEnd() { return c1KeywordEnd; }
 	}
 
 	public class TransitionElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Assignment c00AssignmentEvent;
-		private CrossReference c000CrossReferenceEvent;
-		private Keyword c01Keyword;
-		private Assignment c1AssignmentState;
-		private CrossReference c10CrossReferenceState;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(5);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Assignment c00AssignmentEvent = (Assignment)c0Group.eContents().get(0);
+		private final CrossReference c000CrossReferenceEvent = (CrossReference)c00AssignmentEvent.eContents().get(0);
+		private final Keyword c01KeywordEqualsSignGreaterThanSign = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentState = (Assignment)cGroup.eContents().get(1);
+		private final CrossReference c10CrossReferenceState = (CrossReference)c1AssignmentState.eContents().get(0);
 		
 		// Transition : event = [ Event ] '=>' state = [ State ] ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(5)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// event = [ Event ] '=>' state = [ State ]
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// event = [ Event ] '=>'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// event = [ Event ]
-		public Assignment ele00AssignmentEvent() {
-			return (c00AssignmentEvent != null) ? c00AssignmentEvent : (c00AssignmentEvent = (Assignment)ele0Group().eContents().get(0)); 
-		}
+		public Assignment ele00AssignmentEvent() { return c00AssignmentEvent; }
 
 		// [ Event ]
-		public CrossReference ele000CrossReferenceEvent() {
-			return (c000CrossReferenceEvent != null) ? c000CrossReferenceEvent : (c000CrossReferenceEvent = (CrossReference)ele00AssignmentEvent().eContents().get(0)); 
-		}
+		public CrossReference ele000CrossReferenceEvent() { return c000CrossReferenceEvent; }
 
 		// '=>'
-		public Keyword ele01Keyword() {
-			return (c01Keyword != null) ? c01Keyword : (c01Keyword = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordEqualsSignGreaterThanSign() { return c01KeywordEqualsSignGreaterThanSign; }
 
 		// state = [ State ]
-		public Assignment ele1AssignmentState() {
-			return (c1AssignmentState != null) ? c1AssignmentState : (c1AssignmentState = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentState() { return c1AssignmentState; }
 
 		// [ State ]
-		public CrossReference ele10CrossReferenceState() {
-			return (c10CrossReferenceState != null) ? c10CrossReferenceState : (c10CrossReferenceState = (CrossReference)ele1AssignmentState().eContents().get(0)); 
-		}
+		public CrossReference ele10CrossReferenceState() { return c10CrossReferenceState; }
 	}
 	
 	public final static FowlerDslGrammarAccess INSTANCE = new FowlerDslGrammarAccess();
diff --git a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/AbstractProposalProvider.java b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/AbstractProposalProvider.java
index 86b5465..5faa9cf 100644
--- a/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/AbstractProposalProvider.java
+++ b/plugins/org.eclipse.xtext.ui.common/src/org/eclipse/xtext/ui/common/editor/codecompletion/AbstractProposalProvider.java
@@ -1,3 +1,10 @@
+/*******************************************************************************
+ * Copyright (c) 2008 itemis AG (http://www.itemis.eu) 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
+ *******************************************************************************/
 package org.eclipse.xtext.ui.common.editor.codecompletion;
 
 import java.util.ArrayList;
@@ -25,7 +32,6 @@ import org.eclipse.xtext.LexerRule;
 import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.crossref.IScopedElement;
-import org.eclipse.xtext.crossref.impl.SimpleAttributeResolver;
 import org.eclipse.xtext.parsetree.AbstractNode;
 import org.eclipse.xtext.parsetree.LeafNode;
 import org.eclipse.xtext.resource.XtextResource;
@@ -53,16 +59,6 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 	@Inject
 	protected ILinkingCandidatesService linkingCandidatesService;
 
-	protected SimpleAttributeResolver<String> nameResolver;
-	
-	protected SimpleAttributeResolver<String> createNameResolver() {
-		return SimpleAttributeResolver.newResolver(String.class, "name");
-	}
-	
-	public AbstractProposalProvider() {
-		nameResolver = createNameResolver();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -145,7 +141,7 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 	}
 
 	/**
-	 * @return the default integer value for ecore::EInt <code>RuleCall<>
+	 * @return the default integer value for ecore::EInt <code>RuleCall<></code>
 	 */
 	protected int getDefaultIntegerValue() {
 		return 0;
@@ -192,8 +188,7 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 			
 			Iterable<IScopedElement> candidates = linkingCandidatesService.getLinkingCandidates(model, ref);
 			
-			String trimmedPrefix = prefix.trim();
-			
+			final String trimmedPrefix = prefix.trim();
 			for (IScopedElement candidate : candidates) {
 				if (candidate.name() != null && isCandidateMatchingPrefix(model, ref, candidate, trimmedPrefix)) {
 					completionProposalList.add(
@@ -206,13 +201,11 @@ public abstract class AbstractProposalProvider implements IProposalProvider {
 	}
 	
 	protected boolean isCandidateMatchingPrefix(EObject model, EReference ref, IScopedElement candidate, String prefix) {
-		return Strings.emptyIfNull(candidate.name()).regionMatches(true, 0, prefix, 0, prefix.length());
+		if (candidate.name() == null)
+			throw new IllegalArgumentException("unnamed candidates may not be proposed");
+		return candidate.name().regionMatches(true, 0, prefix, 0, prefix.length());
 	}
 	
-	protected String getLabel(EObject candidate, EReference ref, EObject context) {
-		return nameResolver.getValue(candidate);
-	}
-
 	/**
 	 * @return a new <code>XtextCompletionProposal</code> for the given text and offset.
 	 */
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
index e39b7fa..8617a78 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
@@ -14,10 +14,10 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1" eType="//AbstractRule" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractRule">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java
index 77487a7..abd639a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-10 12:15:46
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-10 15:09:23
 
 package org.eclipse.xtext.crossrefs.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java
index 1c2a508..36ab92b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-10 12:15:45
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-10 15:09:23
 
 package org.eclipse.xtext.crossrefs.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java
index a7a2494..6b7c4ed 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-10 12:15:32
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-10 15:09:11
 
 package org.eclipse.xtext.crossrefs.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java
index 63d1a24..82b43dd 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-10 12:15:32
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-10 15:09:10
 
 package org.eclipse.xtext.crossrefs.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java
index 87626e5..fcb0712 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java
@@ -11,138 +11,96 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class ImportUriTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class MainElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Assignment c0AssignmentImports;
-		private RuleCall c00ParserRuleCallImport;
-		private Assignment c1AssignmentTypes;
-		private RuleCall c10ParserRuleCallType;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Assignment c0AssignmentImports = (Assignment)cGroup.eContents().get(0);
+		private final RuleCall c00ParserRuleCallImport = (RuleCall)c0AssignmentImports.eContents().get(0);
+		private final Assignment c1AssignmentTypes = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallType = (RuleCall)c1AssignmentTypes.eContents().get(0);
 		
 		// Main : ( imports += Import ) * ( types += Type ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( imports += Import ) * ( types += Type ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// ( imports += Import ) *
-		public Assignment ele0AssignmentImports() {
-			return (c0AssignmentImports != null) ? c0AssignmentImports : (c0AssignmentImports = (Assignment)eleGroup().eContents().get(0)); 
-		}
+		public Assignment ele0AssignmentImports() { return c0AssignmentImports; }
 
 		// Import
-		public RuleCall ele00ParserRuleCallImport() {
-			return (c00ParserRuleCallImport != null) ? c00ParserRuleCallImport : (c00ParserRuleCallImport = (RuleCall)ele0AssignmentImports().eContents().get(0)); 
-		}
+		public RuleCall ele00ParserRuleCallImport() { return c00ParserRuleCallImport; }
 
 		// ( types += Type ) *
-		public Assignment ele1AssignmentTypes() {
-			return (c1AssignmentTypes != null) ? c1AssignmentTypes : (c1AssignmentTypes = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentTypes() { return c1AssignmentTypes; }
 
 		// Type
-		public RuleCall ele10ParserRuleCallType() {
-			return (c10ParserRuleCallType != null) ? c10ParserRuleCallType : (c10ParserRuleCallType = (RuleCall)ele1AssignmentTypes().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallType() { return c10ParserRuleCallType; }
 	}
 
 	public class ImportElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Keyword c0KeywordImport;
-		private Assignment c1AssignmentImportURI;
-		private RuleCall c10LexerRuleCallSTRING;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordImport = (Keyword)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentImportURI = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallSTRING = (RuleCall)c1AssignmentImportURI.eContents().get(0);
 		
 		// Import : 'import' importURI = STRING ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'import' importURI = STRING
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'import'
-		public Keyword ele0KeywordImport() {
-			return (c0KeywordImport != null) ? c0KeywordImport : (c0KeywordImport = (Keyword)eleGroup().eContents().get(0)); 
-		}
+		public Keyword ele0KeywordImport() { return c0KeywordImport; }
 
 		// importURI = STRING
-		public Assignment ele1AssignmentImportURI() {
-			return (c1AssignmentImportURI != null) ? c1AssignmentImportURI : (c1AssignmentImportURI = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentImportURI() { return c1AssignmentImportURI; }
 
 		// STRING
-		public RuleCall ele10LexerRuleCallSTRING() {
-			return (c10LexerRuleCallSTRING != null) ? c10LexerRuleCallSTRING : (c10LexerRuleCallSTRING = (RuleCall)ele1AssignmentImportURI().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallSTRING() { return c10LexerRuleCallSTRING; }
 	}
 
 	public class TypeElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordType;
-		private Assignment c001AssignmentName;
-		private RuleCall c0010LexerRuleCallID;
-		private Keyword c01KeywordExtends;
-		private Assignment c1AssignmentExtends;
-		private CrossReference c10CrossReferenceType;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordType = (Keyword)c00Group.eContents().get(0);
+		private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+		private final Keyword c01KeywordExtends = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentExtends = (Assignment)cGroup.eContents().get(1);
+		private final CrossReference c10CrossReferenceType = (CrossReference)c1AssignmentExtends.eContents().get(0);
 		
 		// Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'type' name = ID 'extends' ^extends = [ Type ]
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'type' name = ID 'extends'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'type' name = ID
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'type'
-		public Keyword ele000KeywordType() {
-			return (c000KeywordType != null) ? c000KeywordType : (c000KeywordType = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordType() { return c000KeywordType; }
 
 		// name = ID
-		public Assignment ele001AssignmentName() {
-			return (c001AssignmentName != null) ? c001AssignmentName : (c001AssignmentName = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentName() { return c001AssignmentName; }
 
 		// ID
-		public RuleCall ele0010LexerRuleCallID() {
-			return (c0010LexerRuleCallID != null) ? c0010LexerRuleCallID : (c0010LexerRuleCallID = (RuleCall)ele001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
 
 		// 'extends'
-		public Keyword ele01KeywordExtends() {
-			return (c01KeywordExtends != null) ? c01KeywordExtends : (c01KeywordExtends = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordExtends() { return c01KeywordExtends; }
 
 		// ^extends = [ Type ]
-		public Assignment ele1AssignmentExtends() {
-			return (c1AssignmentExtends != null) ? c1AssignmentExtends : (c1AssignmentExtends = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentExtends() { return c1AssignmentExtends; }
 
 		// [ Type ]
-		public CrossReference ele10CrossReferenceType() {
-			return (c10CrossReferenceType != null) ? c10CrossReferenceType : (c10CrossReferenceType = (CrossReference)ele1AssignmentExtends().eContents().get(0)); 
-		}
+		public CrossReference ele10CrossReferenceType() { return c10CrossReferenceType; }
 	}
 	
 	public final static ImportUriTestLanguageGrammarAccess INSTANCE = new ImportUriTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java
index 25b0052..3c2ab54 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java
@@ -11,138 +11,96 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class LangATestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class MainElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Assignment c0AssignmentImports;
-		private RuleCall c00ParserRuleCallImport;
-		private Assignment c1AssignmentTypes;
-		private RuleCall c10ParserRuleCallType;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Assignment c0AssignmentImports = (Assignment)cGroup.eContents().get(0);
+		private final RuleCall c00ParserRuleCallImport = (RuleCall)c0AssignmentImports.eContents().get(0);
+		private final Assignment c1AssignmentTypes = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallType = (RuleCall)c1AssignmentTypes.eContents().get(0);
 		
 		// Main : ( imports += Import ) * ( types += Type ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( imports += Import ) * ( types += Type ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// ( imports += Import ) *
-		public Assignment ele0AssignmentImports() {
-			return (c0AssignmentImports != null) ? c0AssignmentImports : (c0AssignmentImports = (Assignment)eleGroup().eContents().get(0)); 
-		}
+		public Assignment ele0AssignmentImports() { return c0AssignmentImports; }
 
 		// Import
-		public RuleCall ele00ParserRuleCallImport() {
-			return (c00ParserRuleCallImport != null) ? c00ParserRuleCallImport : (c00ParserRuleCallImport = (RuleCall)ele0AssignmentImports().eContents().get(0)); 
-		}
+		public RuleCall ele00ParserRuleCallImport() { return c00ParserRuleCallImport; }
 
 		// ( types += Type ) *
-		public Assignment ele1AssignmentTypes() {
-			return (c1AssignmentTypes != null) ? c1AssignmentTypes : (c1AssignmentTypes = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentTypes() { return c1AssignmentTypes; }
 
 		// Type
-		public RuleCall ele10ParserRuleCallType() {
-			return (c10ParserRuleCallType != null) ? c10ParserRuleCallType : (c10ParserRuleCallType = (RuleCall)ele1AssignmentTypes().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallType() { return c10ParserRuleCallType; }
 	}
 
 	public class ImportElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Keyword c0KeywordImport;
-		private Assignment c1AssignmentUri;
-		private RuleCall c10LexerRuleCallSTRING;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordImport = (Keyword)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentUri = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallSTRING = (RuleCall)c1AssignmentUri.eContents().get(0);
 		
 		// Import : 'import' uri = STRING ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'import' uri = STRING
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'import'
-		public Keyword ele0KeywordImport() {
-			return (c0KeywordImport != null) ? c0KeywordImport : (c0KeywordImport = (Keyword)eleGroup().eContents().get(0)); 
-		}
+		public Keyword ele0KeywordImport() { return c0KeywordImport; }
 
 		// uri = STRING
-		public Assignment ele1AssignmentUri() {
-			return (c1AssignmentUri != null) ? c1AssignmentUri : (c1AssignmentUri = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentUri() { return c1AssignmentUri; }
 
 		// STRING
-		public RuleCall ele10LexerRuleCallSTRING() {
-			return (c10LexerRuleCallSTRING != null) ? c10LexerRuleCallSTRING : (c10LexerRuleCallSTRING = (RuleCall)ele1AssignmentUri().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallSTRING() { return c10LexerRuleCallSTRING; }
 	}
 
 	public class TypeElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordType;
-		private Assignment c001AssignmentName;
-		private RuleCall c0010LexerRuleCallID;
-		private Keyword c01KeywordExtends;
-		private Assignment c1AssignmentExtends;
-		private CrossReference c10CrossReferenceType;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordType = (Keyword)c00Group.eContents().get(0);
+		private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+		private final Keyword c01KeywordExtends = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentExtends = (Assignment)cGroup.eContents().get(1);
+		private final CrossReference c10CrossReferenceType = (CrossReference)c1AssignmentExtends.eContents().get(0);
 		
 		// Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'type' name = ID 'extends' ^extends = [ Type ]
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'type' name = ID 'extends'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'type' name = ID
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'type'
-		public Keyword ele000KeywordType() {
-			return (c000KeywordType != null) ? c000KeywordType : (c000KeywordType = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordType() { return c000KeywordType; }
 
 		// name = ID
-		public Assignment ele001AssignmentName() {
-			return (c001AssignmentName != null) ? c001AssignmentName : (c001AssignmentName = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentName() { return c001AssignmentName; }
 
 		// ID
-		public RuleCall ele0010LexerRuleCallID() {
-			return (c0010LexerRuleCallID != null) ? c0010LexerRuleCallID : (c0010LexerRuleCallID = (RuleCall)ele001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
 
 		// 'extends'
-		public Keyword ele01KeywordExtends() {
-			return (c01KeywordExtends != null) ? c01KeywordExtends : (c01KeywordExtends = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordExtends() { return c01KeywordExtends; }
 
 		// ^extends = [ Type ]
-		public Assignment ele1AssignmentExtends() {
-			return (c1AssignmentExtends != null) ? c1AssignmentExtends : (c1AssignmentExtends = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentExtends() { return c1AssignmentExtends; }
 
 		// [ Type ]
-		public CrossReference ele10CrossReferenceType() {
-			return (c10CrossReferenceType != null) ? c10CrossReferenceType : (c10CrossReferenceType = (CrossReference)ele1AssignmentExtends().eContents().get(0)); 
-		}
+		public CrossReference ele10CrossReferenceType() { return c10CrossReferenceType; }
 	}
 	
 	public final static LangATestLanguageGrammarAccess INSTANCE = new LangATestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java
index 131caae..2ff8848 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-10 12:15:37
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-10 15:09:15
 
 package org.eclipse.xtext.dummy.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java
index 58d5b35..d4d6658 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-10 12:15:37
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-10 15:09:15
 
 package org.eclipse.xtext.dummy.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parsetree/reconstr/DummyTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parsetree/reconstr/DummyTestLanguageParseTreeConstructor.java
index 94679cb..948d6a4 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parsetree/reconstr/DummyTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parsetree/reconstr/DummyTestLanguageParseTreeConstructor.java
@@ -278,7 +278,7 @@ protected class Element_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return DummyTestLanguageGrammarAccess.INSTANCE.prElement().ele1Keyword();
+		return DummyTestLanguageGrammarAccess.INSTANCE.prElement().ele1KeywordSemicolon();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java
index 69573c2..a56923a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java
@@ -11,105 +11,73 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class DummyTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class ModelElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentElements;
-		private RuleCall c0ParserRuleCallElement;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Assignment cAssignmentElements = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallElement = (RuleCall)cAssignmentElements.eContents().get(0);
 		
 		// Model : ( elements += Element ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( elements += Element ) *
-		public Assignment eleAssignmentElements() {
-			return (cAssignmentElements != null) ? cAssignmentElements : (cAssignmentElements = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentElements() { return cAssignmentElements; }
 
 		// Element
-		public RuleCall ele0ParserRuleCallElement() {
-			return (c0ParserRuleCallElement != null) ? c0ParserRuleCallElement : (c0ParserRuleCallElement = (RuleCall)eleAssignmentElements().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallElement() { return c0ParserRuleCallElement; }
 	}
 
 	public class ElementElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Assignment c0000AssignmentOptional;
-		private Keyword c00000KeywordOptional;
-		private Keyword c0001KeywordElement;
-		private Assignment c001AssignmentName;
-		private RuleCall c0010LexerRuleCallID;
-		private Assignment c01AssignmentDescriptions;
-		private RuleCall c010LexerRuleCallSTRING;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Assignment c0000AssignmentOptional = (Assignment)c000Group.eContents().get(0);
+		private final Keyword c00000KeywordOptional = (Keyword)c0000AssignmentOptional.eContents().get(0);
+		private final Keyword c0001KeywordElement = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+		private final Assignment c01AssignmentDescriptions = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallSTRING = (RuleCall)c01AssignmentDescriptions.eContents().get(0);
+		private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1);
 		
 		// Element : ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) * ';' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) * ';'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// ( optional ?= 'optional' ) ? 'element' name = ID ( descriptions += STRING ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// ( optional ?= 'optional' ) ? 'element' name = ID
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// ( optional ?= 'optional' ) ? 'element'
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// ( optional ?= 'optional' ) ?
-		public Assignment ele0000AssignmentOptional() {
-			return (c0000AssignmentOptional != null) ? c0000AssignmentOptional : (c0000AssignmentOptional = (Assignment)ele000Group().eContents().get(0)); 
-		}
+		public Assignment ele0000AssignmentOptional() { return c0000AssignmentOptional; }
 
 		// 'optional'
-		public Keyword ele00000KeywordOptional() {
-			return (c00000KeywordOptional != null) ? c00000KeywordOptional : (c00000KeywordOptional = (Keyword)ele0000AssignmentOptional().eContents().get(0)); 
-		}
+		public Keyword ele00000KeywordOptional() { return c00000KeywordOptional; }
 
 		// 'element'
-		public Keyword ele0001KeywordElement() {
-			return (c0001KeywordElement != null) ? c0001KeywordElement : (c0001KeywordElement = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordElement() { return c0001KeywordElement; }
 
 		// name = ID
-		public Assignment ele001AssignmentName() {
-			return (c001AssignmentName != null) ? c001AssignmentName : (c001AssignmentName = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentName() { return c001AssignmentName; }
 
 		// ID
-		public RuleCall ele0010LexerRuleCallID() {
-			return (c0010LexerRuleCallID != null) ? c0010LexerRuleCallID : (c0010LexerRuleCallID = (RuleCall)ele001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
 
 		// ( descriptions += STRING ) *
-		public Assignment ele01AssignmentDescriptions() {
-			return (c01AssignmentDescriptions != null) ? c01AssignmentDescriptions : (c01AssignmentDescriptions = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentDescriptions() { return c01AssignmentDescriptions; }
 
 		// STRING
-		public RuleCall ele010LexerRuleCallSTRING() {
-			return (c010LexerRuleCallSTRING != null) ? c010LexerRuleCallSTRING : (c010LexerRuleCallSTRING = (RuleCall)ele01AssignmentDescriptions().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallSTRING() { return c010LexerRuleCallSTRING; }
 
 		// ';'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; }
 	}
 	
 	public final static DummyTestLanguageGrammarAccess INSTANCE = new DummyTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java
index 2b7a0d6..249242c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-10 12:15:33
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-10 15:09:12
 
 package org.eclipse.xtext.grammarinheritance.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java
index 27e01ea..c64cc4a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-10 12:15:33
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-10 15:09:11
 
 package org.eclipse.xtext.grammarinheritance.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java
index 8586a4f..46fd3f8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parsetree/reconstr/ConcreteTestLanguageParseTreeConstructor.java
@@ -166,7 +166,7 @@ protected class ConcreteParserRule_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ConcreteTestLanguageGrammarAccess.INSTANCE.prConcreteParserRule().ele01Keyword();
+		return ConcreteTestLanguageGrammarAccess.INSTANCE.prConcreteParserRule().ele01KeywordColon();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
index 8fa8be6..346939d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
@@ -11,36 +11,26 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class AbstractTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class InheritedParserRuleElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Keyword c0KeywordElement;
-		private Assignment c1AssignmentName;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordElement = (Keyword)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
 		
 		// InheritedParserRule returns mm :: AType : 'element' name = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'element' name = ID
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'element'
-		public Keyword ele0KeywordElement() {
-			return (c0KeywordElement != null) ? c0KeywordElement : (c0KeywordElement = (Keyword)eleGroup().eContents().get(0)); 
-		}
+		public Keyword ele0KeywordElement() { return c0KeywordElement; }
 
 		// name = ID
-		public Assignment ele1AssignmentName() {
-			return (c1AssignmentName != null) ? c1AssignmentName : (c1AssignmentName = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentName() { return c1AssignmentName; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 	
 	public final static AbstractTestLanguageGrammarAccess INSTANCE = new AbstractTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
index ca7d3ac..88b2708 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
@@ -11,66 +11,46 @@ import org.eclipse.xtext.grammarinheritance.services.AbstractTestLanguageGrammar
 public class ConcreteTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class ConcreteParserRuleElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordModel;
-		private Assignment c001AssignmentMagicNumber;
-		private RuleCall c0010LexerRuleCallREAL;
-		private Keyword c01Keyword;
-		private Assignment c1AssignmentElements;
-		private RuleCall c10ParserRuleCallInheritedParserRule;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordModel = (Keyword)c00Group.eContents().get(0);
+		private final Assignment c001AssignmentMagicNumber = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallREAL = (RuleCall)c001AssignmentMagicNumber.eContents().get(0);
+		private final Keyword c01KeywordColon = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentElements = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallInheritedParserRule = (RuleCall)c1AssignmentElements.eContents().get(0);
 		
 		// ConcreteParserRule : 'model' magicNumber = REAL ':' ( elements += InheritedParserRule ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'model' magicNumber = REAL ':' ( elements += InheritedParserRule ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'model' magicNumber = REAL ':'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'model' magicNumber = REAL
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'model'
-		public Keyword ele000KeywordModel() {
-			return (c000KeywordModel != null) ? c000KeywordModel : (c000KeywordModel = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordModel() { return c000KeywordModel; }
 
 		// magicNumber = REAL
-		public Assignment ele001AssignmentMagicNumber() {
-			return (c001AssignmentMagicNumber != null) ? c001AssignmentMagicNumber : (c001AssignmentMagicNumber = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentMagicNumber() { return c001AssignmentMagicNumber; }
 
 		// REAL
-		public RuleCall ele0010LexerRuleCallREAL() {
-			return (c0010LexerRuleCallREAL != null) ? c0010LexerRuleCallREAL : (c0010LexerRuleCallREAL = (RuleCall)ele001AssignmentMagicNumber().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallREAL() { return c0010LexerRuleCallREAL; }
 
 		// ':'
-		public Keyword ele01Keyword() {
-			return (c01Keyword != null) ? c01Keyword : (c01Keyword = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordColon() { return c01KeywordColon; }
 
 		// ( elements += InheritedParserRule ) *
-		public Assignment ele1AssignmentElements() {
-			return (c1AssignmentElements != null) ? c1AssignmentElements : (c1AssignmentElements = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentElements() { return c1AssignmentElements; }
 
 		// InheritedParserRule
-		public RuleCall ele10ParserRuleCallInheritedParserRule() {
-			return (c10ParserRuleCallInheritedParserRule != null) ? c10ParserRuleCallInheritedParserRule : (c10ParserRuleCallInheritedParserRule = (RuleCall)ele1AssignmentElements().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallInheritedParserRule() { return c10ParserRuleCallInheritedParserRule; }
 	}
 	
 	public final static ConcreteTestLanguageGrammarAccess INSTANCE = new ConcreteTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java
index 1a01337..e1bbbd6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-10 12:15:36
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-10 15:09:15
 
 package org.eclipse.xtext.metamodelreferencing.tests.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java
index a3a57b1..3e2ae28 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-10 12:15:36
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-10 15:09:14
 
 package org.eclipse.xtext.metamodelreferencing.tests.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java
index e006e16..932b23b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-10 12:15:37
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-10 15:09:15
 
 package org.eclipse.xtext.metamodelreferencing.tests.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java
index c7523cf..815dbc6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-10 12:15:37
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-10 15:09:15
 
 package org.eclipse.xtext.metamodelreferencing.tests.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java
index 8ce334d..dba566f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MetamodelRefTestLanguageGrammarAccess.java
@@ -11,84 +11,60 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class MetamodelRefTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class FooElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Assignment c0AssignmentName;
-		private RuleCall c00LexerRuleCallID;
-		private Assignment c1AssignmentNameRefs;
-		private RuleCall c10ParserRuleCallNameRef;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Assignment c0AssignmentName = (Assignment)cGroup.eContents().get(0);
+		private final RuleCall c00LexerRuleCallID = (RuleCall)c0AssignmentName.eContents().get(0);
+		private final Assignment c1AssignmentNameRefs = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallNameRef = (RuleCall)c1AssignmentNameRefs.eContents().get(0);
 		
 		// Foo : name = ID ( nameRefs += NameRef ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID ( nameRefs += NameRef ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// name = ID
-		public Assignment ele0AssignmentName() {
-			return (c0AssignmentName != null) ? c0AssignmentName : (c0AssignmentName = (Assignment)eleGroup().eContents().get(0)); 
-		}
+		public Assignment ele0AssignmentName() { return c0AssignmentName; }
 
 		// ID
-		public RuleCall ele00LexerRuleCallID() {
-			return (c00LexerRuleCallID != null) ? c00LexerRuleCallID : (c00LexerRuleCallID = (RuleCall)ele0AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00LexerRuleCallID() { return c00LexerRuleCallID; }
 
 		// ( nameRefs += NameRef ) *
-		public Assignment ele1AssignmentNameRefs() {
-			return (c1AssignmentNameRefs != null) ? c1AssignmentNameRefs : (c1AssignmentNameRefs = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentNameRefs() { return c1AssignmentNameRefs; }
 
 		// NameRef
-		public RuleCall ele10ParserRuleCallNameRef() {
-			return (c10ParserRuleCallNameRef != null) ? c10ParserRuleCallNameRef : (c10ParserRuleCallNameRef = (RuleCall)ele1AssignmentNameRefs().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallNameRef() { return c10ParserRuleCallNameRef; }
 	}
 
 	public class NameRefElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentRule;
-		private CrossReference c0CrossReferenceParserRule;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Assignment cAssignmentRule = (Assignment)rule.eContents().get(1);
+		private final CrossReference c0CrossReferenceParserRule = (CrossReference)cAssignmentRule.eContents().get(0);
 		
 		// NameRef returns RuleCall : rule = [ ParserRule ] ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// rule = [ ParserRule ]
-		public Assignment eleAssignmentRule() {
-			return (cAssignmentRule != null) ? cAssignmentRule : (cAssignmentRule = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentRule() { return cAssignmentRule; }
 
 		// [ ParserRule ]
-		public CrossReference ele0CrossReferenceParserRule() {
-			return (c0CrossReferenceParserRule != null) ? c0CrossReferenceParserRule : (c0CrossReferenceParserRule = (CrossReference)eleAssignmentRule().eContents().get(0)); 
-		}
+		public CrossReference ele0CrossReferenceParserRule() { return c0CrossReferenceParserRule; }
 	}
 
 	public class MyRuleElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentName;
-		private RuleCall c0LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Assignment cAssignmentName = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0LexerRuleCallID = (RuleCall)cAssignmentName.eContents().get(0);
 		
 		// MyRule returns ParserRule : name = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID
-		public Assignment eleAssignmentName() {
-			return (cAssignmentName != null) ? cAssignmentName : (cAssignmentName = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentName() { return cAssignmentName; }
 
 		// ID
-		public RuleCall ele0LexerRuleCallID() {
-			return (c0LexerRuleCallID != null) ? c0LexerRuleCallID : (c0LexerRuleCallID = (RuleCall)eleAssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0LexerRuleCallID() { return c0LexerRuleCallID; }
 	}
 	
 	public final static MetamodelRefTestLanguageGrammarAccess INSTANCE = new MetamodelRefTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java
index 0022130..cc42437 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/services/MultiGenMMTestLanguageGrammarAccess.java
@@ -11,63 +11,45 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class MultiGenMMTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class FooElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Assignment c0AssignmentName;
-		private RuleCall c00LexerRuleCallID;
-		private Assignment c1AssignmentNameRefs;
-		private RuleCall c10ParserRuleCallNameRef;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Assignment c0AssignmentName = (Assignment)cGroup.eContents().get(0);
+		private final RuleCall c00LexerRuleCallID = (RuleCall)c0AssignmentName.eContents().get(0);
+		private final Assignment c1AssignmentNameRefs = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallNameRef = (RuleCall)c1AssignmentNameRefs.eContents().get(0);
 		
 		// Foo : name = ID ( nameRefs += NameRef ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID ( nameRefs += NameRef ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// name = ID
-		public Assignment ele0AssignmentName() {
-			return (c0AssignmentName != null) ? c0AssignmentName : (c0AssignmentName = (Assignment)eleGroup().eContents().get(0)); 
-		}
+		public Assignment ele0AssignmentName() { return c0AssignmentName; }
 
 		// ID
-		public RuleCall ele00LexerRuleCallID() {
-			return (c00LexerRuleCallID != null) ? c00LexerRuleCallID : (c00LexerRuleCallID = (RuleCall)ele0AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00LexerRuleCallID() { return c00LexerRuleCallID; }
 
 		// ( nameRefs += NameRef ) *
-		public Assignment ele1AssignmentNameRefs() {
-			return (c1AssignmentNameRefs != null) ? c1AssignmentNameRefs : (c1AssignmentNameRefs = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentNameRefs() { return c1AssignmentNameRefs; }
 
 		// NameRef
-		public RuleCall ele10ParserRuleCallNameRef() {
-			return (c10ParserRuleCallNameRef != null) ? c10ParserRuleCallNameRef : (c10ParserRuleCallNameRef = (RuleCall)ele1AssignmentNameRefs().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallNameRef() { return c10ParserRuleCallNameRef; }
 	}
 
 	public class NameRefElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentName;
-		private RuleCall c0LexerRuleCallSTRING;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Assignment cAssignmentName = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0LexerRuleCallSTRING = (RuleCall)cAssignmentName.eContents().get(0);
 		
 		// NameRef returns FooBar : name = STRING ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = STRING
-		public Assignment eleAssignmentName() {
-			return (cAssignmentName != null) ? cAssignmentName : (cAssignmentName = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentName() { return cAssignmentName; }
 
 		// STRING
-		public RuleCall ele0LexerRuleCallSTRING() {
-			return (c0LexerRuleCallSTRING != null) ? c0LexerRuleCallSTRING : (c0LexerRuleCallSTRING = (RuleCall)eleAssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0LexerRuleCallSTRING() { return c0LexerRuleCallSTRING; }
 	}
 	
 	public final static MultiGenMMTestLanguageGrammarAccess INSTANCE = new MultiGenMMTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java
index 16f26de..f55fa4c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-10 12:15:35
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-10 15:09:14
 
 package org.eclipse.xtext.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java
index 9ecc67c..e4b309e 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-10 12:15:35
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-10 15:09:13
 
 package org.eclipse.xtext.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java
new file mode 100644
index 0000000..25cefd4
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/AbstractFormatterTestLanguageRuntimeConfig.java
@@ -0,0 +1,75 @@
+package org.eclipse.xtext.parsetree.formatter;
+
+import java.util.Set;
+
+import org.eclipse.xtext.service.AbstractServiceRegistrationFactory;
+
+/**
+ * used to register components to be used at runtime.
+ */
+public abstract class AbstractFormatterTestLanguageRuntimeConfig extends AbstractServiceRegistrationFactory {
+
+	protected Class<? extends org.eclipse.xtext.IMetamodelAccess> getIMetamodelAccess() {
+		return org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageMetamodelAccess.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.IGrammarAccess> getIGrammarAccess() {
+		return org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageGrammarAccess.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IAstFactory> getIAstFactory() {
+		return org.eclipse.xtext.parser.GenericEcoreElementFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.IParser> getIParser() {
+		return org.eclipse.xtext.parsetree.formatter.parser.FormatterTestLanguageParser.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> getIAntlrTokenFileProvider() {
+		return org.eclipse.xtext.parsetree.formatter.parser.FormatterTestLanguageAntlrTokenFileProvider.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.resource.IResourceFactory> getIResourceFactory() {
+		return org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageResourceFactory.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor> getIParseTreeConstructor() {
+		return org.eclipse.xtext.parsetree.formatter.parsetree.reconstr.FormatterTestLanguageParseTreeConstructor.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parsetree.reconstr.ITokenSerializer> getITokenSerializer() {
+		return org.eclipse.xtext.parsetree.reconstr.impl.WhitespacePreservingTokenSerializer.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer> getICrossReferenceSerializer() {
+		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleCrossReferenceSerializer.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parsetree.reconstr.ITransientValueService> getITransientValueService() {
+		return org.eclipse.xtext.parsetree.reconstr.impl.SimpleTransientValueService.class;
+	}
+		
+	protected Class<? extends org.eclipse.xtext.parser.antlr.Lexer> getLexer() {
+		return org.eclipse.xtext.parsetree.formatter.parser.internal.InternalFormatterTestLanguageLexer.class;
+	}
+		
+	
+	public Set<IServiceRegistration> registrations() {
+		return scope(org.eclipse.xtext.parsetree.formatter.IFormatterTestLanguage.SCOPE)
+		.with(org.eclipse.xtext.IMetamodelAccess.class, getIMetamodelAccess())
+		.with(org.eclipse.xtext.IGrammarAccess.class, getIGrammarAccess())
+		.with(org.eclipse.xtext.parser.IAstFactory.class, getIAstFactory())
+		.with(org.eclipse.xtext.parser.IParser.class, getIParser())
+		.with(org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider.class, getIAntlrTokenFileProvider())
+		.with(org.eclipse.xtext.resource.IResourceFactory.class, getIResourceFactory())
+		.with(org.eclipse.xtext.parsetree.reconstr.IParseTreeConstructor.class, getIParseTreeConstructor())
+		.with(org.eclipse.xtext.parsetree.reconstr.ITokenSerializer.class, getITokenSerializer())
+		.with(org.eclipse.xtext.parsetree.reconstr.ICrossReferenceSerializer.class, getICrossReferenceSerializer())
+		.with(org.eclipse.xtext.parsetree.reconstr.ITransientValueService.class, getITransientValueService())
+		.with(org.eclipse.xtext.parser.antlr.Lexer.class, getLexer())
+		
+			.registrations();
+	}
+
+}
+			
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi
new file mode 100644
index 0000000..15c4afd
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xtext:Grammar 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" xmlns:xtext="http://www.eclipse.org/2008/Xtext">
+  <idElements>org</idElements>
+  <idElements>eclipse</idElements>
+  <idElements>xtext</idElements>
+  <idElements>parsetree</idElements>
+  <idElements>formatter</idElements>
+  <idElements>FormatterTestLanguage</idElements>
+  <metamodelDeclarations xsi:type="xtext:GeneratedMetamodel" name="formattertestlanguage" nsURI="http://simple/formattertestlanguage"/>
+  <rules xsi:type="xtext:ParserRule" name="Root">
+    <type metamodel="//@metamodelDeclarations.0">
+      <type xsi:type="ecore:EClass" href="http://simple/formattertestlanguage#//Root"/>
+    </type>
+    <alternatives xsi:type="xtext:Group">
+      <abstractTokens xsi:type="xtext:Keyword" value="test"/>
+      <abstractTokens xsi:type="xtext:Alternatives">
+        <groups xsi:type="xtext:RuleCall" rule="//@rules.2"/>
+        <groups xsi:type="xtext:RuleCall" rule="//@rules.3"/>
+      </abstractTokens>
+    </alternatives>
+  </rules>
+  <rules xsi:type="xtext:ParserRule" name="Line">
+    <type metamodel="//@metamodelDeclarations.0">
+      <type xsi:type="ecore:EClass" href="http://simple/formattertestlanguage#//Line"/>
+    </type>
+    <alternatives xsi:type="xtext:Group">
+      <abstractTokens xsi:type="xtext:Group">
+        <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="+=">
+          <terminal xsi:type="xtext:RuleCall">
+            <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/>
+          </terminal>
+        </abstractTokens>
+        <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="+=">
+          <terminal xsi:type="xtext:RuleCall">
+            <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/>
+          </terminal>
+        </abstractTokens>
+      </abstractTokens>
+      <abstractTokens xsi:type="xtext:Keyword" value=";"/>
+    </alternatives>
+  </rules>
+  <rules xsi:type="xtext:ParserRule" name="TestLinewrap">
+    <type metamodel="//@metamodelDeclarations.0">
+      <type xsi:type="ecore:EClass" href="http://simple/formattertestlanguage#//TestLinewrap"/>
+    </type>
+    <alternatives xsi:type="xtext:Group">
+      <abstractTokens xsi:type="xtext:Keyword" value="linewrap"/>
+      <abstractTokens xsi:type="xtext:Assignment" cardinality="*" feature="items" operator="+=">
+        <terminal xsi:type="xtext:RuleCall" rule="//@rules.1"/>
+      </abstractTokens>
+    </alternatives>
+  </rules>
+  <rules xsi:type="xtext:ParserRule" name="TestIndentation">
+    <type metamodel="//@metamodelDeclarations.0">
+      <type xsi:type="ecore:EClass" href="http://simple/formattertestlanguage#//TestIndentation"/>
+    </type>
+    <alternatives xsi:type="xtext:Group">
+      <abstractTokens xsi:type="xtext:Group">
+        <abstractTokens xsi:type="xtext:Group">
+          <abstractTokens xsi:type="xtext:Keyword" value="indentation"/>
+          <abstractTokens xsi:type="xtext:Keyword" value="{"/>
+        </abstractTokens>
+        <abstractTokens xsi:type="xtext:Alternatives" cardinality="*">
+          <groups xsi:type="xtext:Assignment" feature="sub" operator="+=">
+            <terminal xsi:type="xtext:RuleCall" rule="//@rules.3"/>
+          </groups>
+          <groups xsi:type="xtext:Assignment" feature="items" operator="+=">
+            <terminal xsi:type="xtext:RuleCall" rule="//@rules.1"/>
+          </groups>
+        </abstractTokens>
+      </abstractTokens>
+      <abstractTokens xsi:type="xtext:Keyword" value="}"/>
+    </alternatives>
+  </rules>
+</xtext:Grammar>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageStandaloneSetup.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageStandaloneSetup.java
new file mode 100644
index 0000000..8307ead
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguageStandaloneSetup.java
@@ -0,0 +1,53 @@
+/*
+Generated with Xtext
+*/
+package org.eclipse.xtext.parsetree.formatter;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.EcoreUtil2;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.resource.IResourceFactory;
+import org.eclipse.xtext.service.IServiceScope;
+import org.eclipse.xtext.service.ServiceRegistry;
+import org.eclipse.xtext.service.IServiceRegistrationFactory.IServiceRegistration;
+
+import org.eclipse.xtext.parsetree.formatter.IFormatterTestLanguage;
+
+public abstract class FormatterTestLanguageStandaloneSetup {
+
+	private static boolean isInitialized = false;
+
+	public synchronized static void doSetup() {
+		if(!isInitialized) {
+			// setup super language first
+			org.eclipse.xtext.builtin.XtextBuiltinStandaloneSetup.doSetup();
+			
+			for (IServiceRegistration reg :  new org.eclipse.xtext.parsetree.formatter.FormatterTestLanguageRuntimeConfig().registrations()) {
+				ServiceRegistry.registerFactory(reg.scope(), reg.serviceFactory(), reg.priority());
+			}
+			
+			// register resource factory to EMF
+			IResourceFactory resourceFactory = new org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageResourceFactory();
+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("formattertestlanguage", resourceFactory);
+			
+			
+			// initialize EPackages
+			
+				if (!EPackage.Registry.INSTANCE.containsKey("http://simple/formattertestlanguage")) {
+					EPackage formattertestlanguage = EcoreUtil2.loadEPackage(
+							"classpath:/org/eclipse/xtext/parsetree/formatter/formattertestlanguage.ecore",
+							FormatterTestLanguageStandaloneSetup.class.getClassLoader());
+					if (formattertestlanguage == null)
+						throw new IllegalStateException(
+								"Couldn't load EPackage from 'classpath:/org/eclipse/xtext/parsetree/formatter/formattertestlanguage.ecore'");
+					EPackage.Registry.INSTANCE.put("http://simple/formattertestlanguage", formattertestlanguage);
+				}
+			
+			isInitialized = true;
+		}
+	}
+	
+	public static IServiceScope getServiceScope() {
+		return org.eclipse.xtext.parsetree.formatter.IFormatterTestLanguage.SCOPE;
+	}
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/IFormatterTestLanguage.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/IFormatterTestLanguage.java
new file mode 100644
index 0000000..704cc69
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/IFormatterTestLanguage.java
@@ -0,0 +1,23 @@
+/*
+Generated with Xtext
+*/
+package org.eclipse.xtext.parsetree.formatter;
+
+import org.eclipse.xtext.service.IServiceScope;
+import org.eclipse.xtext.service.ServiceScopeFactory;
+
+public interface IFormatterTestLanguage {
+
+	/**
+	 * the unique identifier of this language. 
+	 * To be used to get the language descriptor and related services from the registry.
+	 * Within ILanguageServices it is encouraged to use dependency injection instead
+	 * of directly accessing the ServiceRegistry 
+	 */
+	public static final String ID = "org.eclipse.xtext.parsetree.formatter.FormatterTestLanguage";
+	public static final String NAME = "FormatterTestLanguage";
+	public static final String NAMESPACE = "org.eclipse.xtext.parsetree.formatter";
+	public static final String[] FILE_EXTENSIONS = new String[]{"formattertestlanguage"};
+	public static final IServiceScope SCOPE = ServiceScopeFactory.createScope(ID, org.eclipse.xtext.builtin.IXtextBuiltin.SCOPE);
+	
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage.ecore
new file mode 100644
index 0000000..f1a0ba0
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage.ecore
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ASCII"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="formattertestlanguage" nsURI="http://simple/formattertestlanguage" nsPrefix="formattertestlanguage">
+  <eClassifiers xsi:type="ecore:EClass" name="Root">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1" eType="//Line" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Line">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" upperBound="-1">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" upperBound="-1">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TestLinewrap" eSuperTypes="//Root"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TestIndentation" eSuperTypes="//Root">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sub" upperBound="-1" eType="//TestIndentation" containment="true"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/FormatterTestLanguageAntlrTokenFileProvider.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/FormatterTestLanguageAntlrTokenFileProvider.java
new file mode 100644
index 0000000..de69fa6
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/FormatterTestLanguageAntlrTokenFileProvider.java
@@ -0,0 +1,15 @@
+/*
+Generated with Xtext
+*/
+package org.eclipse.xtext.parsetree.formatter.parser;
+
+import java.io.InputStream;
+import org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider;
+
+public class FormatterTestLanguageAntlrTokenFileProvider implements IAntlrTokenFileProvider {
+	
+	public InputStream getAntlrTokenFile() {
+		ClassLoader classLoader = FormatterTestLanguageAntlrTokenFileProvider.class.getClassLoader();
+    	return classLoader.getResourceAsStream("org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.tokens");
+	}
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/FormatterTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/FormatterTestLanguageParser.java
new file mode 100644
index 0000000..54f7ef5
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/FormatterTestLanguageParser.java
@@ -0,0 +1,44 @@
+/*
+Generated with Xtext
+*/
+package org.eclipse.xtext.parsetree.formatter.parser;
+
+import org.antlr.runtime.ANTLRInputStream;
+import org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider;
+import org.eclipse.xtext.parser.IAstFactory;
+import org.eclipse.xtext.parser.IParseResult;
+import org.eclipse.xtext.parser.ParseException;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+import org.eclipse.xtext.service.Inject;
+
+import org.eclipse.xtext.parsetree.formatter.parser.internal.InternalFormatterTestLanguageLexer;
+import org.eclipse.xtext.parsetree.formatter.parser.internal.InternalFormatterTestLanguageParser;
+
+public class FormatterTestLanguageParser extends org.eclipse.xtext.parser.AbstractParser {
+	
+	@Inject 
+    protected AntlrTokenDefProvider antlrTokenDefProvider;
+	
+	@Override
+	protected IParseResult parse(String ruleName, ANTLRInputStream in, IAstFactory factory) {
+		InternalFormatterTestLanguageLexer lexer = new InternalFormatterTestLanguageLexer(in);
+		XtextTokenStream stream = new XtextTokenStream(lexer);
+		InternalFormatterTestLanguageParser parser = new InternalFormatterTestLanguageParser(
+				stream, factory, grammarAccess.getGrammar());
+		parser.setTokenTypeMap(antlrTokenDefProvider.getTokenDefMap());
+		try {
+			if(ruleName != null) {
+				return parser.parse(ruleName);
+			} else {
+				return parser.parse();
+			}
+		} catch (Exception re) {
+			throw new ParseException(re.getMessage(),re);
+		}
+	}
+	
+	@Override 
+	protected String getDefaultRuleName() {
+		return "Root";
+	}
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g
new file mode 100644
index 0000000..61fd7f4
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g
@@ -0,0 +1,267 @@
+/*
+Generated with Xtext
+*/
+grammar InternalFormatterTestLanguage;
+
+options {
+	superClass=AbstractAntlrParser;
+}
+
+@lexer::header {
+package org.eclipse.xtext.parsetree.formatter.parser.internal;
+
+// Hack: Use our own Lexer superclass by means of import. 
+// Currently there is no other way to specify the superclass for the lexer.
+import org.eclipse.xtext.parser.antlr.Lexer;
+}
+
+@parser::header {
+package org.eclipse.xtext.parsetree.formatter.parser.internal; 
+
+import java.io.InputStream;
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.parser.*;
+import org.eclipse.xtext.parser.impl.*;
+import org.eclipse.xtext.parsetree.*;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.parser.antlr.AbstractAntlrParser;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+}
+
+@parser::members {
+ 
+    public InternalFormatterTestLanguageParser(TokenStream input, IAstFactory factory, Grammar g) {
+        this(input);
+        this.factory = factory;
+		grammar = g;
+    }
+    
+    @Override
+    protected InputStream getTokenFile() {
+    	ClassLoader classLoader = InternalFormatterTestLanguageParser.class.getClassLoader();
+    	return classLoader.getResourceAsStream("org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.tokens");
+    }
+    
+    @Override
+    protected String getFirstRuleName() {
+    	return "Root";	
+   	} 
+}
+
+@rulecatch { 
+    catch (RecognitionException re) { 
+        recover(input,re); 
+        appendSkippedTokens();
+    } 
+}
+
+
+
+// Entry rule entryRuleRoot
+entryRuleRoot returns [EObject current=null] :
+	{ currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); }
+	 iv_ruleRoot=ruleRoot 
+	 { $current=$iv_ruleRoot.current; } 
+	 EOF 
+;
+
+// Rule Root
+ruleRoot returns [EObject current=null] 
+    @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); }
+    @after { resetLookahead(); }:
+('test' 
+    {
+        createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); 
+    }
+(
+    { 
+        currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.0" /* xtext::RuleCall */, currentNode); 
+    }
+    this_TestLinewrap=ruleTestLinewrap
+    { 
+        $current = $this_TestLinewrap.current; 
+        currentNode = currentNode.getParent();
+    }
+
+    |
+    { 
+        currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.1" /* xtext::RuleCall */, currentNode); 
+    }
+    this_TestIndentation=ruleTestIndentation
+    { 
+        $current = $this_TestIndentation.current; 
+        currentNode = currentNode.getParent();
+    }
+));
+    
+
+
+// Entry rule entryRuleLine
+entryRuleLine returns [EObject current=null] :
+	{ currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); }
+	 iv_ruleLine=ruleLine 
+	 { $current=$iv_ruleLine.current; } 
+	 EOF 
+;
+
+// Rule Line
+ruleLine returns [EObject current=null] 
+    @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); }
+    @after { resetLookahead(); }:
+(((	
+	
+	    lv_type=RULE_ID
+    { 
+    createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::RuleCall */, "type"); 
+    }
+ 
+	    {
+	        if ($current==null) {
+	            $current = factory.create("Line");
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+	        
+	        factory.add($current, "type", lv_type,"ID");
+	         }
+	
+)(	
+	
+	    lv_name=RULE_ID
+    { 
+    createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); 
+    }
+ 
+	    {
+	        if ($current==null) {
+	            $current = factory.create("Line");
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+	        
+	        factory.add($current, "name", lv_name,"ID");
+	         }
+	
+))';' 
+    {
+        createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); 
+    }
+);
+    
+
+
+// Entry rule entryRuleTestLinewrap
+entryRuleTestLinewrap returns [EObject current=null] :
+	{ currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); }
+	 iv_ruleTestLinewrap=ruleTestLinewrap 
+	 { $current=$iv_ruleTestLinewrap.current; } 
+	 EOF 
+;
+
+// Rule TestLinewrap
+ruleTestLinewrap returns [EObject current=null] 
+    @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); }
+    @after { resetLookahead(); }:
+('linewrap' 
+    {
+        createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); 
+    }
+(	
+	
+	    
+	    { 
+	        currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); 
+	    }
+	    lv_items=ruleLine 
+	    {
+	        currentNode = currentNode.getParent();
+	        if ($current==null) {
+	            $current = factory.create("TestLinewrap");
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+	        
+	        factory.add($current, "items", lv_items,null);
+	         }
+	
+)*);
+    
+
+
+// Entry rule entryRuleTestIndentation
+entryRuleTestIndentation returns [EObject current=null] :
+	{ currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); }
+	 iv_ruleTestIndentation=ruleTestIndentation 
+	 { $current=$iv_ruleTestIndentation.current; } 
+	 EOF 
+;
+
+// Rule TestIndentation
+ruleTestIndentation returns [EObject current=null] 
+    @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); }
+    @after { resetLookahead(); }:
+((('indentation' 
+    {
+        createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); 
+    }
+'{' 
+    {
+        createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); 
+    }
+)((	
+	
+	    
+	    { 
+	        currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.0/@terminal" /* xtext::RuleCall */, currentNode); 
+	    }
+	    lv_sub=ruleTestIndentation 
+	    {
+	        currentNode = currentNode.getParent();
+	        if ($current==null) {
+	            $current = factory.create("TestIndentation");
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+	        
+	        factory.add($current, "sub", lv_sub,null);
+	         }
+	
+)
+    |(	
+	
+	    
+	    { 
+	        currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.1/@terminal" /* xtext::RuleCall */, currentNode); 
+	    }
+	    lv_items=ruleLine 
+	    {
+	        currentNode = currentNode.getParent();
+	        if ($current==null) {
+	            $current = factory.create("TestIndentation");
+	            associateNodeWithAstElement(currentNode, $current);
+	        }
+	        
+	        factory.add($current, "items", lv_items,null);
+	         }
+	
+))*)'}' 
+    {
+        createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); 
+    }
+);
+    
+
+
+
+RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+
+RULE_INT : ('0'..'9')+;
+
+RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
+
+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
+
+RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
+
+RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
+
+RULE_ANY_OTHER : .;
+
+
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.tokens b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.tokens
new file mode 100644
index 0000000..0cf78fa
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.tokens
@@ -0,0 +1,13 @@
+RULE_ML_COMMENT=7
+RULE_ID=4
+RULE_WS=9
+RULE_INT=5
+RULE_STRING=6
+RULE_ANY_OTHER=10
+RULE_SL_COMMENT=8
+'test'=11
+'linewrap'=13
+'}'=16
+'{'=15
+';'=12
+'indentation'=14
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java
new file mode 100644
index 0000000..5dfb3f0
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java
@@ -0,0 +1,974 @@
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2008-12-10 15:09:26
+
+package org.eclipse.xtext.parsetree.formatter.parser.internal;
+
+// Hack: Use our own Lexer superclass by means of import. 
+// Currently there is no other way to specify the superclass for the lexer.
+import org.eclipse.xtext.parser.antlr.Lexer;
+
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+
+public class InternalFormatterTestLanguageLexer extends Lexer {
+    public static final int RULE_ML_COMMENT=7;
+    public static final int T14=14;
+    public static final int RULE_ID=4;
+    public static final int RULE_WS=9;
+    public static final int T11=11;
+    public static final int T15=15;
+    public static final int EOF=-1;
+    public static final int RULE_INT=5;
+    public static final int RULE_STRING=6;
+    public static final int T12=12;
+    public static final int Tokens=17;
+    public static final int RULE_ANY_OTHER=10;
+    public static final int T16=16;
+    public static final int RULE_SL_COMMENT=8;
+    public static final int T13=13;
+    public InternalFormatterTestLanguageLexer() {;} 
+    public InternalFormatterTestLanguageLexer(CharStream input) {
+        super(input);
+    }
+    public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g"; }
+
+    // $ANTLR start T11
+    public final void mT11() throws RecognitionException {
+        try {
+            int _type = T11;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:10:5: ( 'test' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:10:7: 'test'
+            {
+            match("test"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T11
+
+    // $ANTLR start T12
+    public final void mT12() throws RecognitionException {
+        try {
+            int _type = T12;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:11:5: ( ';' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:11:7: ';'
+            {
+            match(';'); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T12
+
+    // $ANTLR start T13
+    public final void mT13() throws RecognitionException {
+        try {
+            int _type = T13;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:12:5: ( 'linewrap' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:12:7: 'linewrap'
+            {
+            match("linewrap"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T13
+
+    // $ANTLR start T14
+    public final void mT14() throws RecognitionException {
+        try {
+            int _type = T14;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:13:5: ( 'indentation' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:13:7: 'indentation'
+            {
+            match("indentation"); 
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T14
+
+    // $ANTLR start T15
+    public final void mT15() throws RecognitionException {
+        try {
+            int _type = T15;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:14:5: ( '{' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:14:7: '{'
+            {
+            match('{'); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T15
+
+    // $ANTLR start T16
+    public final void mT16() throws RecognitionException {
+        try {
+            int _type = T16;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:15:5: ( '}' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:15:7: '}'
+            {
+            match('}'); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end T16
+
+    // $ANTLR start RULE_ID
+    public final void mRULE_ID() throws RecognitionException {
+        try {
+            int _type = RULE_ID;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:253:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:253:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:253:11: ( '^' )?
+            int alt1=2;
+            int LA1_0 = input.LA(1);
+
+            if ( (LA1_0=='^') ) {
+                alt1=1;
+            }
+            switch (alt1) {
+                case 1 :
+                    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:253:12: '^'
+                    {
+                    match('^'); 
+
+                    }
+                    break;
+
+            }
+
+            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse =
+                    new MismatchedSetException(null,input);
+                recover(mse);    throw mse;
+            }
+
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:253:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop2:
+            do {
+                int alt2=2;
+                int LA2_0 = input.LA(1);
+
+                if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='Z')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='z')) ) {
+                    alt2=1;
+                }
+
+
+                switch (alt2) {
+            	case 1 :
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:
+            	    {
+            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse =
+            	            new MismatchedSetException(null,input);
+            	        recover(mse);    throw mse;
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop2;
+                }
+            } while (true);
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_ID
+
+    // $ANTLR start RULE_INT
+    public final void mRULE_INT() throws RecognitionException {
+        try {
+            int _type = RULE_INT;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:255:10: ( ( '0' .. '9' )+ )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:255:12: ( '0' .. '9' )+
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:255:12: ( '0' .. '9' )+
+            int cnt3=0;
+            loop3:
+            do {
+                int alt3=2;
+                int LA3_0 = input.LA(1);
+
+                if ( ((LA3_0>='0' && LA3_0<='9')) ) {
+                    alt3=1;
+                }
+
+
+                switch (alt3) {
+            	case 1 :
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:255:13: '0' .. '9'
+            	    {
+            	    matchRange('0','9'); 
+
+            	    }
+            	    break;
+
+            	default :
+            	    if ( cnt3 >= 1 ) break loop3;
+                        EarlyExitException eee =
+                            new EarlyExitException(3, input);
+                        throw eee;
+                }
+                cnt3++;
+            } while (true);
+
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_INT
+
+    // $ANTLR start RULE_STRING
+    public final void mRULE_STRING() throws RecognitionException {
+        try {
+            int _type = RULE_STRING;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:257:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+            int alt6=2;
+            int LA6_0 = input.LA(1);
+
+            if ( (LA6_0=='\"') ) {
+                alt6=1;
+            }
+            else if ( (LA6_0=='\'') ) {
+                alt6=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("257:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input);
+
+                throw nvae;
+            }
+            switch (alt6) {
+                case 1 :
+                    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:257:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"'
+                    {
+                    match('\"'); 
+                    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:257:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )*
+                    loop4:
+                    do {
+                        int alt4=3;
+                        int LA4_0 = input.LA(1);
+
+                        if ( (LA4_0=='\\') ) {
+                            alt4=1;
+                        }
+                        else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFE')) ) {
+                            alt4=2;
+                        }
+
+
+                        switch (alt4) {
+                    	case 1 :
+                    	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:257:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+                    	    {
+                    	    match('\\'); 
+                    	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
+                    	        input.consume();
+
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+                    	case 2 :
+                    	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:257:65: ~ ( '\\\\' | '\"' )
+                    	    {
+                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
+                    	        input.consume();
+
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop4;
+                        }
+                    } while (true);
+
+                    match('\"'); 
+
+                    }
+                    break;
+                case 2 :
+                    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:257:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\''
+                    {
+                    match('\''); 
+                    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:257:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )*
+                    loop5:
+                    do {
+                        int alt5=3;
+                        int LA5_0 = input.LA(1);
+
+                        if ( (LA5_0=='\\') ) {
+                            alt5=1;
+                        }
+                        else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFE')) ) {
+                            alt5=2;
+                        }
+
+
+                        switch (alt5) {
+                    	case 1 :
+                    	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:257:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' )
+                    	    {
+                    	    match('\\'); 
+                    	    if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) {
+                    	        input.consume();
+
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+                    	case 2 :
+                    	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:257:152: ~ ( '\\\\' | '\\'' )
+                    	    {
+                    	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) {
+                    	        input.consume();
+
+                    	    }
+                    	    else {
+                    	        MismatchedSetException mse =
+                    	            new MismatchedSetException(null,input);
+                    	        recover(mse);    throw mse;
+                    	    }
+
+
+                    	    }
+                    	    break;
+
+                    	default :
+                    	    break loop5;
+                        }
+                    } while (true);
+
+                    match('\''); 
+
+                    }
+                    break;
+
+            }
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_STRING
+
+    // $ANTLR start RULE_ML_COMMENT
+    public final void mRULE_ML_COMMENT() throws RecognitionException {
+        try {
+            int _type = RULE_ML_COMMENT;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:259:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:259:19: '/*' ( options {greedy=false; } : . )* '*/'
+            {
+            match("/*"); 
+
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:259:24: ( options {greedy=false; } : . )*
+            loop7:
+            do {
+                int alt7=2;
+                int LA7_0 = input.LA(1);
+
+                if ( (LA7_0=='*') ) {
+                    int LA7_1 = input.LA(2);
+
+                    if ( (LA7_1=='/') ) {
+                        alt7=2;
+                    }
+                    else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFE')) ) {
+                        alt7=1;
+                    }
+
+
+                }
+                else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFE')) ) {
+                    alt7=1;
+                }
+
+
+                switch (alt7) {
+            	case 1 :
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:259:52: .
+            	    {
+            	    matchAny(); 
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop7;
+                }
+            } while (true);
+
+            match("*/"); 
+
+            channel=HIDDEN;
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_ML_COMMENT
+
+    // $ANTLR start RULE_SL_COMMENT
+    public final void mRULE_SL_COMMENT() throws RecognitionException {
+        try {
+            int _type = RULE_SL_COMMENT;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:261:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:261:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )?
+            {
+            match("//"); 
+
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:261:24: (~ ( '\\n' | '\\r' ) )*
+            loop8:
+            do {
+                int alt8=2;
+                int LA8_0 = input.LA(1);
+
+                if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFE')) ) {
+                    alt8=1;
+                }
+
+
+                switch (alt8) {
+            	case 1 :
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:261:24: ~ ( '\\n' | '\\r' )
+            	    {
+            	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse =
+            	            new MismatchedSetException(null,input);
+            	        recover(mse);    throw mse;
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop8;
+                }
+            } while (true);
+
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:261:38: ( ( '\\r' )? '\\n' )?
+            int alt10=2;
+            int LA10_0 = input.LA(1);
+
+            if ( (LA10_0=='\n'||LA10_0=='\r') ) {
+                alt10=1;
+            }
+            switch (alt10) {
+                case 1 :
+                    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:261:39: ( '\\r' )? '\\n'
+                    {
+                    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:261:39: ( '\\r' )?
+                    int alt9=2;
+                    int LA9_0 = input.LA(1);
+
+                    if ( (LA9_0=='\r') ) {
+                        alt9=1;
+                    }
+                    switch (alt9) {
+                        case 1 :
+                            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:261:39: '\\r'
+                            {
+                            match('\r'); 
+
+                            }
+                            break;
+
+                    }
+
+                    match('\n'); 
+
+                    }
+                    break;
+
+            }
+
+            channel=HIDDEN;
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_SL_COMMENT
+
+    // $ANTLR start RULE_WS
+    public final void mRULE_WS() throws RecognitionException {
+        try {
+            int _type = RULE_WS;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:263:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:263:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:263:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            int cnt11=0;
+            loop11:
+            do {
+                int alt11=2;
+                int LA11_0 = input.LA(1);
+
+                if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {
+                    alt11=1;
+                }
+
+
+                switch (alt11) {
+            	case 1 :
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:
+            	    {
+            	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
+            	        input.consume();
+
+            	    }
+            	    else {
+            	        MismatchedSetException mse =
+            	            new MismatchedSetException(null,input);
+            	        recover(mse);    throw mse;
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    if ( cnt11 >= 1 ) break loop11;
+                        EarlyExitException eee =
+                            new EarlyExitException(11, input);
+                        throw eee;
+                }
+                cnt11++;
+            } while (true);
+
+            channel=HIDDEN;
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_WS
+
+    // $ANTLR start RULE_ANY_OTHER
+    public final void mRULE_ANY_OTHER() throws RecognitionException {
+        try {
+            int _type = RULE_ANY_OTHER;
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:265:16: ( . )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:265:18: .
+            {
+            matchAny(); 
+
+            }
+
+            this.type = _type;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end RULE_ANY_OTHER
+
+    public void mTokens() throws RecognitionException {
+        // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt12=13;
+        int LA12_0 = input.LA(1);
+
+        if ( (LA12_0=='t') ) {
+            int LA12_1 = input.LA(2);
+
+            if ( (LA12_1=='e') ) {
+                int LA12_15 = input.LA(3);
+
+                if ( (LA12_15=='s') ) {
+                    int LA12_27 = input.LA(4);
+
+                    if ( (LA12_27=='t') ) {
+                        int LA12_30 = input.LA(5);
+
+                        if ( ((LA12_30>='0' && LA12_30<='9')||(LA12_30>='A' && LA12_30<='Z')||LA12_30=='_'||(LA12_30>='a' && LA12_30<='z')) ) {
+                            alt12=7;
+                        }
+                        else {
+                            alt12=1;}
+                    }
+                    else {
+                        alt12=7;}
+                }
+                else {
+                    alt12=7;}
+            }
+            else {
+                alt12=7;}
+        }
+        else if ( (LA12_0==';') ) {
+            alt12=2;
+        }
+        else if ( (LA12_0=='l') ) {
+            int LA12_3 = input.LA(2);
+
+            if ( (LA12_3=='i') ) {
+                int LA12_18 = input.LA(3);
+
+                if ( (LA12_18=='n') ) {
+                    int LA12_28 = input.LA(4);
+
+                    if ( (LA12_28=='e') ) {
+                        int LA12_31 = input.LA(5);
+
+                        if ( (LA12_31=='w') ) {
+                            int LA12_34 = input.LA(6);
+
+                            if ( (LA12_34=='r') ) {
+                                int LA12_36 = input.LA(7);
+
+                                if ( (LA12_36=='a') ) {
+                                    int LA12_38 = input.LA(8);
+
+                                    if ( (LA12_38=='p') ) {
+                                        int LA12_40 = input.LA(9);
+
+                                        if ( ((LA12_40>='0' && LA12_40<='9')||(LA12_40>='A' && LA12_40<='Z')||LA12_40=='_'||(LA12_40>='a' && LA12_40<='z')) ) {
+                                            alt12=7;
+                                        }
+                                        else {
+                                            alt12=3;}
+                                    }
+                                    else {
+                                        alt12=7;}
+                                }
+                                else {
+                                    alt12=7;}
+                            }
+                            else {
+                                alt12=7;}
+                        }
+                        else {
+                            alt12=7;}
+                    }
+                    else {
+                        alt12=7;}
+                }
+                else {
+                    alt12=7;}
+            }
+            else {
+                alt12=7;}
+        }
+        else if ( (LA12_0=='i') ) {
+            int LA12_4 = input.LA(2);
+
+            if ( (LA12_4=='n') ) {
+                int LA12_19 = input.LA(3);
+
+                if ( (LA12_19=='d') ) {
+                    int LA12_29 = input.LA(4);
+
+                    if ( (LA12_29=='e') ) {
+                        int LA12_32 = input.LA(5);
+
+                        if ( (LA12_32=='n') ) {
+                            int LA12_35 = input.LA(6);
+
+                            if ( (LA12_35=='t') ) {
+                                int LA12_37 = input.LA(7);
+
+                                if ( (LA12_37=='a') ) {
+                                    int LA12_39 = input.LA(8);
+
+                                    if ( (LA12_39=='t') ) {
+                                        int LA12_41 = input.LA(9);
+
+                                        if ( (LA12_41=='i') ) {
+                                            int LA12_43 = input.LA(10);
+
+                                            if ( (LA12_43=='o') ) {
+                                                int LA12_44 = input.LA(11);
+
+                                                if ( (LA12_44=='n') ) {
+                                                    int LA12_45 = input.LA(12);
+
+                                                    if ( ((LA12_45>='0' && LA12_45<='9')||(LA12_45>='A' && LA12_45<='Z')||LA12_45=='_'||(LA12_45>='a' && LA12_45<='z')) ) {
+                                                        alt12=7;
+                                                    }
+                                                    else {
+                                                        alt12=4;}
+                                                }
+                                                else {
+                                                    alt12=7;}
+                                            }
+                                            else {
+                                                alt12=7;}
+                                        }
+                                        else {
+                                            alt12=7;}
+                                    }
+                                    else {
+                                        alt12=7;}
+                                }
+                                else {
+                                    alt12=7;}
+                            }
+                            else {
+                                alt12=7;}
+                        }
+                        else {
+                            alt12=7;}
+                    }
+                    else {
+                        alt12=7;}
+                }
+                else {
+                    alt12=7;}
+            }
+            else {
+                alt12=7;}
+        }
+        else if ( (LA12_0=='{') ) {
+            alt12=5;
+        }
+        else if ( (LA12_0=='}') ) {
+            alt12=6;
+        }
+        else if ( (LA12_0=='^') ) {
+            int LA12_7 = input.LA(2);
+
+            if ( ((LA12_7>='A' && LA12_7<='Z')||LA12_7=='_'||(LA12_7>='a' && LA12_7<='z')) ) {
+                alt12=7;
+            }
+            else {
+                alt12=13;}
+        }
+        else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='h')||(LA12_0>='j' && LA12_0<='k')||(LA12_0>='m' && LA12_0<='s')||(LA12_0>='u' && LA12_0<='z')) ) {
+            alt12=7;
+        }
+        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {
+            alt12=8;
+        }
+        else if ( (LA12_0=='\"') ) {
+            int LA12_10 = input.LA(2);
+
+            if ( ((LA12_10>='\u0000' && LA12_10<='\uFFFE')) ) {
+                alt12=9;
+            }
+            else {
+                alt12=13;}
+        }
+        else if ( (LA12_0=='\'') ) {
+            int LA12_11 = input.LA(2);
+
+            if ( ((LA12_11>='\u0000' && LA12_11<='\uFFFE')) ) {
+                alt12=9;
+            }
+            else {
+                alt12=13;}
+        }
+        else if ( (LA12_0=='/') ) {
+            switch ( input.LA(2) ) {
+            case '*':
+                {
+                alt12=10;
+                }
+                break;
+            case '/':
+                {
+                alt12=11;
+                }
+                break;
+            default:
+                alt12=13;}
+
+        }
+        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {
+            alt12=12;
+        }
+        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='.')||LA12_0==':'||(LA12_0>='<' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFE')) ) {
+            alt12=13;
+        }
+        else {
+            NoViableAltException nvae =
+                new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | T14 | T15 | T16 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input);
+
+            throw nvae;
+        }
+        switch (alt12) {
+            case 1 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:10: T11
+                {
+                mT11(); 
+
+                }
+                break;
+            case 2 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:14: T12
+                {
+                mT12(); 
+
+                }
+                break;
+            case 3 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:18: T13
+                {
+                mT13(); 
+
+                }
+                break;
+            case 4 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:22: T14
+                {
+                mT14(); 
+
+                }
+                break;
+            case 5 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:26: T15
+                {
+                mT15(); 
+
+                }
+                break;
+            case 6 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:30: T16
+                {
+                mT16(); 
+
+                }
+                break;
+            case 7 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:34: RULE_ID
+                {
+                mRULE_ID(); 
+
+                }
+                break;
+            case 8 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:42: RULE_INT
+                {
+                mRULE_INT(); 
+
+                }
+                break;
+            case 9 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:51: RULE_STRING
+                {
+                mRULE_STRING(); 
+
+                }
+                break;
+            case 10 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:63: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 11 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:79: RULE_SL_COMMENT
+                {
+                mRULE_SL_COMMENT(); 
+
+                }
+                break;
+            case 12 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:95: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 13 :
+                // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:1:103: RULE_ANY_OTHER
+                {
+                mRULE_ANY_OTHER(); 
+
+                }
+                break;
+
+        }
+
+    }
+
+
+ 
+
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java
new file mode 100644
index 0000000..cf11594
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java
@@ -0,0 +1,626 @@
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2008-12-10 15:09:26
+
+package org.eclipse.xtext.parsetree.formatter.parser.internal; 
+
+import java.io.InputStream;
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.parser.*;
+import org.eclipse.xtext.parser.impl.*;
+import org.eclipse.xtext.parsetree.*;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.parser.antlr.AbstractAntlrParser;
+import org.eclipse.xtext.parser.antlr.XtextTokenStream;
+
+
+import org.antlr.runtime.*;
+import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+
+public class InternalFormatterTestLanguageParser extends AbstractAntlrParser {
+    public static final String[] tokenNames = new String[] {
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'test'", "';'", "'linewrap'", "'indentation'", "'{'", "'}'"
+    };
+    public static final int RULE_ML_COMMENT=7;
+    public static final int RULE_ID=4;
+    public static final int RULE_WS=9;
+    public static final int EOF=-1;
+    public static final int RULE_INT=5;
+    public static final int RULE_STRING=6;
+    public static final int RULE_ANY_OTHER=10;
+    public static final int RULE_SL_COMMENT=8;
+
+        public InternalFormatterTestLanguageParser(TokenStream input) {
+            super(input);
+        }
+        
+
+    public String[] getTokenNames() { return tokenNames; }
+    public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g"; }
+
+
+     
+        public InternalFormatterTestLanguageParser(TokenStream input, IAstFactory factory, Grammar g) {
+            this(input);
+            this.factory = factory;
+    		grammar = g;
+        }
+        
+        @Override
+        protected InputStream getTokenFile() {
+        	ClassLoader classLoader = InternalFormatterTestLanguageParser.class.getClassLoader();
+        	return classLoader.getResourceAsStream("org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.tokens");
+        }
+        
+        @Override
+        protected String getFirstRuleName() {
+        	return "Root";	
+       	} 
+
+
+
+    // $ANTLR start entryRuleRoot
+    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:62:1: entryRuleRoot returns [EObject current=null] : iv_ruleRoot= ruleRoot EOF ;
+    public final EObject entryRuleRoot() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleRoot = null;
+
+
+        try {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:62:46: (iv_ruleRoot= ruleRoot EOF )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:63:2: iv_ruleRoot= ruleRoot EOF
+            {
+             currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); 
+            pushFollow(FOLLOW_ruleRoot_in_entryRuleRoot70);
+            iv_ruleRoot=ruleRoot();
+            _fsp--;
+
+             current =iv_ruleRoot; 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleRoot80); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end entryRuleRoot
+
+
+    // $ANTLR start ruleRoot
+    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:70:1: ruleRoot returns [EObject current=null] : ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) ;
+    public final EObject ruleRoot() throws RecognitionException {
+        EObject current = null;
+
+        EObject this_TestLinewrap = null;
+
+        EObject this_TestIndentation = null;
+
+
+         EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+        try {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:72:33: ( ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:73:1: ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) )
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:73:1: ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:73:2: 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation )
+            {
+            match(input,11,FOLLOW_11_in_ruleRoot114); 
+
+                    createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); 
+                
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:77:1: (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation )
+            int alt1=2;
+            int LA1_0 = input.LA(1);
+
+            if ( (LA1_0==13) ) {
+                alt1=1;
+            }
+            else if ( (LA1_0==14) ) {
+                alt1=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("77:1: (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation )", 1, 0, input);
+
+                throw nvae;
+            }
+            switch (alt1) {
+                case 1 :
+                    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:78:5: this_TestLinewrap= ruleTestLinewrap
+                    {
+                     
+                            currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.0" /* xtext::RuleCall */, currentNode); 
+                        
+                    pushFollow(FOLLOW_ruleTestLinewrap_in_ruleRoot137);
+                    this_TestLinewrap=ruleTestLinewrap();
+                    _fsp--;
+
+                     
+                            current = this_TestLinewrap; 
+                            currentNode = currentNode.getParent();
+                        
+
+                    }
+                    break;
+                case 2 :
+                    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:88:5: this_TestIndentation= ruleTestIndentation
+                    {
+                     
+                            currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.1" /* xtext::RuleCall */, currentNode); 
+                        
+                    pushFollow(FOLLOW_ruleTestIndentation_in_ruleRoot164);
+                    this_TestIndentation=ruleTestIndentation();
+                    _fsp--;
+
+                     
+                            current = this_TestIndentation; 
+                            currentNode = currentNode.getParent();
+                        
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end ruleRoot
+
+
+    // $ANTLR start entryRuleLine
+    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:101:1: entryRuleLine returns [EObject current=null] : iv_ruleLine= ruleLine EOF ;
+    public final EObject entryRuleLine() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleLine = null;
+
+
+        try {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:101:46: (iv_ruleLine= ruleLine EOF )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:102:2: iv_ruleLine= ruleLine EOF
+            {
+             currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); 
+            pushFollow(FOLLOW_ruleLine_in_entryRuleLine199);
+            iv_ruleLine=ruleLine();
+            _fsp--;
+
+             current =iv_ruleLine; 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleLine209); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end entryRuleLine
+
+
+    // $ANTLR start ruleLine
+    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:109:1: ruleLine returns [EObject current=null] : ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) ;
+    public final EObject ruleLine() throws RecognitionException {
+        EObject current = null;
+
+        Token lv_type=null;
+        Token lv_name=null;
+
+         EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+        try {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:111:33: ( ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:112:1: ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' )
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:112:1: ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:112:2: ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';'
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:112:2: ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:112:3: (lv_type= RULE_ID ) (lv_name= RULE_ID )
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:112:3: (lv_type= RULE_ID )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:114:6: lv_type= RULE_ID
+            {
+            lv_type=(Token)input.LT(1);
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleLine256); 
+             
+                createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::RuleCall */, "type"); 
+                
+
+            	        if (current==null) {
+            	            current = factory.create("Line");
+            	            associateNodeWithAstElement(currentNode, current);
+            	        }
+            	        
+            	        factory.add(current, "type", lv_type,"ID");
+            	         
+
+            }
+
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:128:2: (lv_name= RULE_ID )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:130:6: lv_name= RULE_ID
+            {
+            lv_name=(Token)input.LT(1);
+            match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleLine288); 
+             
+                createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); 
+                
+
+            	        if (current==null) {
+            	            current = factory.create("Line");
+            	            associateNodeWithAstElement(currentNode, current);
+            	        }
+            	        
+            	        factory.add(current, "name", lv_name,"ID");
+            	         
+
+            }
+
+
+            }
+
+            match(input,12,FOLLOW_12_in_ruleLine309); 
+
+                    createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); 
+                
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end ruleLine
+
+
+    // $ANTLR start entryRuleTestLinewrap
+    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:153:1: entryRuleTestLinewrap returns [EObject current=null] : iv_ruleTestLinewrap= ruleTestLinewrap EOF ;
+    public final EObject entryRuleTestLinewrap() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleTestLinewrap = null;
+
+
+        try {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:153:54: (iv_ruleTestLinewrap= ruleTestLinewrap EOF )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:154:2: iv_ruleTestLinewrap= ruleTestLinewrap EOF
+            {
+             currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); 
+            pushFollow(FOLLOW_ruleTestLinewrap_in_entryRuleTestLinewrap344);
+            iv_ruleTestLinewrap=ruleTestLinewrap();
+            _fsp--;
+
+             current =iv_ruleTestLinewrap; 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleTestLinewrap354); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end entryRuleTestLinewrap
+
+
+    // $ANTLR start ruleTestLinewrap
+    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:161:1: ruleTestLinewrap returns [EObject current=null] : ( 'linewrap' (lv_items= ruleLine )* ) ;
+    public final EObject ruleTestLinewrap() throws RecognitionException {
+        EObject current = null;
+
+        EObject lv_items = null;
+
+
+         EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+        try {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:163:33: ( ( 'linewrap' (lv_items= ruleLine )* ) )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:164:1: ( 'linewrap' (lv_items= ruleLine )* )
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:164:1: ( 'linewrap' (lv_items= ruleLine )* )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:164:2: 'linewrap' (lv_items= ruleLine )*
+            {
+            match(input,13,FOLLOW_13_in_ruleTestLinewrap388); 
+
+                    createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); 
+                
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:168:1: (lv_items= ruleLine )*
+            loop2:
+            do {
+                int alt2=2;
+                int LA2_0 = input.LA(1);
+
+                if ( (LA2_0==RULE_ID) ) {
+                    alt2=1;
+                }
+
+
+                switch (alt2) {
+            	case 1 :
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:171:6: lv_items= ruleLine
+            	    {
+            	     
+            	    	        currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); 
+            	    	    
+            	    pushFollow(FOLLOW_ruleLine_in_ruleTestLinewrap422);
+            	    lv_items=ruleLine();
+            	    _fsp--;
+
+
+            	    	        currentNode = currentNode.getParent();
+            	    	        if (current==null) {
+            	    	            current = factory.create("TestLinewrap");
+            	    	            associateNodeWithAstElement(currentNode, current);
+            	    	        }
+            	    	        
+            	    	        factory.add(current, "items", lv_items,null);
+            	    	         
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop2;
+                }
+            } while (true);
+
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end ruleTestLinewrap
+
+
+    // $ANTLR start entryRuleTestIndentation
+    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:190:1: entryRuleTestIndentation returns [EObject current=null] : iv_ruleTestIndentation= ruleTestIndentation EOF ;
+    public final EObject entryRuleTestIndentation() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleTestIndentation = null;
+
+
+        try {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:190:57: (iv_ruleTestIndentation= ruleTestIndentation EOF )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:191:2: iv_ruleTestIndentation= ruleTestIndentation EOF
+            {
+             currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); 
+            pushFollow(FOLLOW_ruleTestIndentation_in_entryRuleTestIndentation462);
+            iv_ruleTestIndentation=ruleTestIndentation();
+            _fsp--;
+
+             current =iv_ruleTestIndentation; 
+            match(input,EOF,FOLLOW_EOF_in_entryRuleTestIndentation472); 
+
+            }
+
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end entryRuleTestIndentation
+
+
+    // $ANTLR start ruleTestIndentation
+    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:198:1: ruleTestIndentation returns [EObject current=null] : ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) ;
+    public final EObject ruleTestIndentation() throws RecognitionException {
+        EObject current = null;
+
+        EObject lv_sub = null;
+
+        EObject lv_items = null;
+
+
+         EObject temp=null; setCurrentLookahead(); resetLookahead(); 
+        try {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:200:33: ( ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:201:1: ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' )
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:201:1: ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:201:2: ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}'
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:201:2: ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:201:3: ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )*
+            {
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:201:3: ( 'indentation' '{' )
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:201:4: 'indentation' '{'
+            {
+            match(input,14,FOLLOW_14_in_ruleTestIndentation508); 
+
+                    createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); 
+                
+            match(input,15,FOLLOW_15_in_ruleTestIndentation517); 
+
+                    createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); 
+                
+
+            }
+
+            // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:209:2: ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )*
+            loop3:
+            do {
+                int alt3=3;
+                int LA3_0 = input.LA(1);
+
+                if ( (LA3_0==14) ) {
+                    alt3=1;
+                }
+                else if ( (LA3_0==RULE_ID) ) {
+                    alt3=2;
+                }
+
+
+                switch (alt3) {
+            	case 1 :
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:209:3: (lv_sub= ruleTestIndentation )
+            	    {
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:209:3: (lv_sub= ruleTestIndentation )
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:212:6: lv_sub= ruleTestIndentation
+            	    {
+            	     
+            	    	        currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.0/@terminal" /* xtext::RuleCall */, currentNode); 
+            	    	    
+            	    pushFollow(FOLLOW_ruleTestIndentation_in_ruleTestIndentation553);
+            	    lv_sub=ruleTestIndentation();
+            	    _fsp--;
+
+
+            	    	        currentNode = currentNode.getParent();
+            	    	        if (current==null) {
+            	    	            current = factory.create("TestIndentation");
+            	    	            associateNodeWithAstElement(currentNode, current);
+            	    	        }
+            	    	        
+            	    	        factory.add(current, "sub", lv_sub,null);
+            	    	         
+
+            	    }
+
+
+            	    }
+            	    break;
+            	case 2 :
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:227:6: (lv_items= ruleLine )
+            	    {
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:227:6: (lv_items= ruleLine )
+            	    // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:230:6: lv_items= ruleLine
+            	    {
+            	     
+            	    	        currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.1/@terminal" /* xtext::RuleCall */, currentNode); 
+            	    	    
+            	    pushFollow(FOLLOW_ruleLine_in_ruleTestIndentation597);
+            	    lv_items=ruleLine();
+            	    _fsp--;
+
+
+            	    	        currentNode = currentNode.getParent();
+            	    	        if (current==null) {
+            	    	            current = factory.create("TestIndentation");
+            	    	            associateNodeWithAstElement(currentNode, current);
+            	    	        }
+            	    	        
+            	    	        factory.add(current, "items", lv_items,null);
+            	    	         
+
+            	    }
+
+
+            	    }
+            	    break;
+
+            	default :
+            	    break loop3;
+                }
+            } while (true);
+
+
+            }
+
+            match(input,16,FOLLOW_16_in_ruleTestIndentation613); 
+
+                    createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); 
+                
+
+            }
+
+
+            }
+
+             resetLookahead(); 
+        }
+         
+            catch (RecognitionException re) { 
+                recover(input,re); 
+                appendSkippedTokens();
+            } 
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end ruleTestIndentation
+
+
+ 
+
+    public static final BitSet FOLLOW_ruleRoot_in_entryRuleRoot70 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleRoot80 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_11_in_ruleRoot114 = new BitSet(new long[]{0x0000000000006000L});
+    public static final BitSet FOLLOW_ruleTestLinewrap_in_ruleRoot137 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleTestIndentation_in_ruleRoot164 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleLine_in_entryRuleLine199 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleLine209 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleLine256 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_RULE_ID_in_ruleLine288 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_12_in_ruleLine309 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ruleTestLinewrap_in_entryRuleTestLinewrap344 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleTestLinewrap354 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_13_in_ruleTestLinewrap388 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_ruleLine_in_ruleTestLinewrap422 = new BitSet(new long[]{0x0000000000000012L});
+    public static final BitSet FOLLOW_ruleTestIndentation_in_entryRuleTestIndentation462 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_entryRuleTestIndentation472 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_14_in_ruleTestIndentation508 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_15_in_ruleTestIndentation517 = new BitSet(new long[]{0x0000000000014010L});
+    public static final BitSet FOLLOW_ruleTestIndentation_in_ruleTestIndentation553 = new BitSet(new long[]{0x0000000000014010L});
+    public static final BitSet FOLLOW_ruleLine_in_ruleTestIndentation597 = new BitSet(new long[]{0x0000000000014010L});
+    public static final BitSet FOLLOW_16_in_ruleTestIndentation613 = new BitSet(new long[]{0x0000000000000002L});
+
+}
\ No newline at end of file
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage__.g
new file mode 100644
index 0000000..d55db58
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage__.g
@@ -0,0 +1,38 @@
+lexer grammar InternalFormatterTestLanguage;
+@header {
+package org.eclipse.xtext.parsetree.formatter.parser.internal;
+
+// Hack: Use our own Lexer superclass by means of import. 
+// Currently there is no other way to specify the superclass for the lexer.
+import org.eclipse.xtext.parser.antlr.Lexer;
+}
+
+T11 : 'test' ;
+T12 : ';' ;
+T13 : 'linewrap' ;
+T14 : 'indentation' ;
+T15 : '{' ;
+T16 : '}' ;
+
+// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 253
+RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+
+// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 255
+RULE_INT : ('0'..'9')+;
+
+// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 257
+RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' |                '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'';
+
+// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 259
+RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;};
+
+// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 261
+RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;};
+
+// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 263
+RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;};
+
+// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 265
+RULE_ANY_OTHER : .;
+
+
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parsetree/reconstr/FormatterTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parsetree/reconstr/FormatterTestLanguageParseTreeConstructor.java
new file mode 100644
index 0000000..40b6fcb
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parsetree/reconstr/FormatterTestLanguageParseTreeConstructor.java
@@ -0,0 +1,556 @@
+/*
+Generated with Xtext
+*/
+package org.eclipse.xtext.parsetree.formatter.parsetree.reconstr;
+
+//import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.parsetree.reconstr.*;
+import org.eclipse.xtext.parsetree.reconstr.impl.*;
+import org.eclipse.xtext.parsetree.reconstr.impl.AbstractParseTreeConstructor.AbstractToken.Solution;
+import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
+import org.eclipse.xtext.parsetree.formatter.services.FormatterTestLanguageGrammarAccess;
+
+
+public class FormatterTestLanguageParseTreeConstructor extends AbstractParseTreeConstructor {
+
+	public IAbstractToken serialize(EObject object) {
+		if(object == null) throw new IllegalArgumentException("The to-be-serialialized model is null");
+		Solution t = internalSerialize(object);
+		if(t == null) throw new XtextSerializationException(getDescr(object), "No rule found for serialization");
+		return t.getPredecessor();
+	}
+	
+	protected Solution internalSerialize(EObject obj) {
+		IInstanceDescription inst = getDescr(obj);
+		Solution s;
+		if(inst.isInstanceOf("Root") && (s = new Root_Group(inst, null).firstSolution()) != null) return s;
+		if(inst.isInstanceOf("Line") && (s = new Line_Group(inst, null).firstSolution()) != null) return s;
+		if(inst.isInstanceOf("TestLinewrap") && (s = new TestLinewrap_Group(inst, null).firstSolution()) != null) return s;
+		if(inst.isInstanceOf("TestIndentation") && (s = new TestIndentation_Group(inst, null).firstSolution()) != null) return s;
+		return null;
+	}
+	
+/************ begin Rule Root ****************
+ *
+ * Root : 'test' ( TestLinewrap | TestIndentation ) ;
+ *
+ **/
+
+
+// 'test' ( TestLinewrap | TestIndentation )
+protected class Root_Group extends GroupToken {
+	
+	public Root_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Group getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prRoot().eleGroup();
+	}
+		
+	protected Solution createSolution() {	
+		Solution s1 = new Root_1_Alternatives(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new Root_0_Keyword_test(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			if(s2 == null) {
+				s1 = s1.getPredecessor().nextSolution(this);
+				if(s1 == null) return null;
+			} else {
+				last = s2.getPredecessor();
+				return s2;
+			}
+		}
+		return null;
+		
+	}
+}
+
+// 'test'
+protected class Root_0_Keyword_test extends KeywordToken  {
+	
+	public Root_0_Keyword_test(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Keyword getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prRoot().ele0KeywordTest();
+	}	
+}
+
+// TestLinewrap | TestIndentation
+protected class Root_1_Alternatives extends AlternativesToken {
+
+	public Root_1_Alternatives(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Alternatives getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prRoot().ele1Alternatives();
+	}
+	
+	protected Solution createSolution() {
+		AbstractToken t = (first) ? new Root_1_1_RuleCall_TestIndentation(current, this) : new Root_1_0_RuleCall_TestLinewrap(current, this);
+		Solution s = t.firstSolution();
+		if(s == null && activateNextSolution()) s = createSolution();
+		if(s == null) return null;
+		last = s.getPredecessor();
+		return s; 
+	}
+}
+
+// TestLinewrap
+protected class Root_1_0_RuleCall_TestLinewrap extends RuleCallToken {
+	
+	public Root_1_0_RuleCall_TestLinewrap(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public RuleCall getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prRoot().ele10ParserRuleCallTestLinewrap();
+	}
+	
+	protected Solution createSolution() {
+		if(checkForRecursion(TestLinewrap_Group.class, current)) return null;
+		if(!current.isInstanceOf("TestLinewrap")) return null;
+		return new TestLinewrap_Group(current, this).firstSolution();
+	}
+}
+
+// TestIndentation
+protected class Root_1_1_RuleCall_TestIndentation extends RuleCallToken {
+	
+	public Root_1_1_RuleCall_TestIndentation(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public RuleCall getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prRoot().ele11ParserRuleCallTestIndentation();
+	}
+	
+	protected Solution createSolution() {
+		if(checkForRecursion(TestIndentation_Group.class, current)) return null;
+		if(!current.isInstanceOf("TestIndentation")) return null;
+		return new TestIndentation_Group(current, this).firstSolution();
+	}
+}
+
+
+
+/************ end Rule Root ****************/
+
+/************ begin Rule Line ****************
+ *
+ * Line : type += ID name += ID ';' ;
+ *
+ **/
+
+
+// type += ID name += ID ';'
+protected class Line_Group extends GroupToken {
+	
+	public Line_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Group getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prLine().eleGroup();
+	}
+		
+	protected Solution createSolution() {	
+		Solution s1 = new Line_1_Keyword(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new Line_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			if(s2 == null) {
+				s1 = s1.getPredecessor().nextSolution(this);
+				if(s1 == null) return null;
+			} else {
+				last = s2.getPredecessor();
+				return s2;
+			}
+		}
+		return null;
+		
+	}
+}
+
+// type += ID name += ID
+protected class Line_0_Group extends GroupToken {
+	
+	public Line_0_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Group getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prLine().ele0Group();
+	}
+		
+	protected Solution createSolution() {	
+		Solution s1 = new Line_0_1_Assignment_name(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new Line_0_0_Assignment_type(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			if(s2 == null) {
+				s1 = s1.getPredecessor().nextSolution(this);
+				if(s1 == null) return null;
+			} else {
+				last = s2.getPredecessor();
+				return s2;
+			}
+		}
+		return null;
+		
+	}
+}
+
+// type += ID
+protected class Line_0_0_Assignment_type extends AssignmentToken  {
+	
+	public Line_0_0_Assignment_type(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Assignment getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prLine().ele00AssignmentType();
+	}
+	
+	protected Solution createSolution() {
+		if((value = current.getConsumable("type",IS_REQUIRED)) == null) return null;
+		IInstanceDescription obj = current.cloneAndConsume("type");
+		if(true) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
+			type = AssignmentType.LRC;
+			element = FormatterTestLanguageGrammarAccess.INSTANCE.prLine().ele000LexerRuleCallID();
+			return new Solution(obj);
+		}
+		return null;
+	}
+}
+
+// name += ID
+protected class Line_0_1_Assignment_name extends AssignmentToken  {
+	
+	public Line_0_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Assignment getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prLine().ele01AssignmentName();
+	}
+	
+	protected Solution createSolution() {
+		if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null;
+		IInstanceDescription obj = current.cloneAndConsume("name");
+		if(true) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
+			type = AssignmentType.LRC;
+			element = FormatterTestLanguageGrammarAccess.INSTANCE.prLine().ele010LexerRuleCallID();
+			return new Solution(obj);
+		}
+		return null;
+	}
+}
+
+
+// ';'
+protected class Line_1_Keyword extends KeywordToken  {
+	
+	public Line_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Keyword getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prLine().ele1KeywordSemicolon();
+	}	
+}
+
+
+/************ end Rule Line ****************/
+
+/************ begin Rule TestLinewrap ****************
+ *
+ * TestLinewrap : 'linewrap' ( items += Line ) * ;
+ *
+ **/
+
+
+// 'linewrap' ( items += Line ) *
+protected class TestLinewrap_Group extends GroupToken {
+	
+	public TestLinewrap_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Group getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestLinewrap().eleGroup();
+	}
+		
+	protected Solution createSolution() {	
+		Solution s1 = new TestLinewrap_1_Assignment_items(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new TestLinewrap_0_Keyword_linewrap(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			if(s2 == null) {
+				s1 = s1.getPredecessor().nextSolution(this);
+				if(s1 == null) return null;
+			} else {
+				last = s2.getPredecessor();
+				return s2;
+			}
+		}
+		return null;
+		
+	}
+}
+
+// 'linewrap'
+protected class TestLinewrap_0_Keyword_linewrap extends KeywordToken  {
+	
+	public TestLinewrap_0_Keyword_linewrap(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Keyword getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestLinewrap().ele0KeywordLinewrap();
+	}	
+}
+
+// ( items += Line ) *
+protected class TestLinewrap_1_Assignment_items extends AssignmentToken  {
+	
+	public TestLinewrap_1_Assignment_items(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, IS_MANY, !IS_REQUIRED);
+	}
+	
+	public Assignment getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestLinewrap().ele1AssignmentItems();
+	}
+	
+	protected Solution createSolution() {
+		if((value = current.getConsumable("items",!IS_REQUIRED)) == null) return null;
+		IInstanceDescription obj = current.cloneAndConsume("items");
+		if(value instanceof EObject) { // xtext::RuleCall
+			IInstanceDescription param = getDescr((EObject)value);
+			if(param.isInstanceOf("Line")) {
+				Solution s = new Line_Group(param, this).firstSolution();
+				if(s != null) {
+					type = AssignmentType.PRC; 
+					return new Solution(obj,s.getPredecessor());
+				} 
+			}
+		}
+		return null;
+	}
+}
+
+
+/************ end Rule TestLinewrap ****************/
+
+/************ begin Rule TestIndentation ****************
+ *
+ * TestIndentation : 'indentation' '{' ( sub += TestIndentation | items += Line ) * '}' ;
+ *
+ **/
+
+
+// 'indentation' '{' ( sub += TestIndentation | items += Line ) * '}'
+protected class TestIndentation_Group extends GroupToken {
+	
+	public TestIndentation_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Group getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestIndentation().eleGroup();
+	}
+		
+	protected Solution createSolution() {	
+		Solution s1 = new TestIndentation_1_Keyword(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new TestIndentation_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			if(s2 == null) {
+				s1 = s1.getPredecessor().nextSolution(this);
+				if(s1 == null) return null;
+			} else {
+				last = s2.getPredecessor();
+				return s2;
+			}
+		}
+		return null;
+		
+	}
+}
+
+// 'indentation' '{' ( sub += TestIndentation | items += Line ) *
+protected class TestIndentation_0_Group extends GroupToken {
+	
+	public TestIndentation_0_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Group getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestIndentation().ele0Group();
+	}
+		
+	protected Solution createSolution() {	
+		Solution s1 = new TestIndentation_0_1_Alternatives(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new TestIndentation_0_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			if(s2 == null) {
+				s1 = s1.getPredecessor().nextSolution(this);
+				if(s1 == null) return null;
+			} else {
+				last = s2.getPredecessor();
+				return s2;
+			}
+		}
+		return null;
+		
+	}
+}
+
+// 'indentation' '{'
+protected class TestIndentation_0_0_Group extends GroupToken {
+	
+	public TestIndentation_0_0_Group(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Group getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestIndentation().ele00Group();
+	}
+		
+	protected Solution createSolution() {	
+		Solution s1 = new TestIndentation_0_0_1_Keyword(current, this).firstSolution();
+		while(s1 != null) {
+			Solution s2 = new TestIndentation_0_0_0_Keyword_indentation(s1.getCurrent(), s1.getPredecessor()).firstSolution();
+			if(s2 == null) {
+				s1 = s1.getPredecessor().nextSolution(this);
+				if(s1 == null) return null;
+			} else {
+				last = s2.getPredecessor();
+				return s2;
+			}
+		}
+		return null;
+		
+	}
+}
+
+// 'indentation'
+protected class TestIndentation_0_0_0_Keyword_indentation extends KeywordToken  {
+	
+	public TestIndentation_0_0_0_Keyword_indentation(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Keyword getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestIndentation().ele000KeywordIndentation();
+	}	
+}
+
+// '{'
+protected class TestIndentation_0_0_1_Keyword extends KeywordToken  {
+	
+	public TestIndentation_0_0_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Keyword getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestIndentation().ele001KeywordLeftCurlyBracket();
+	}	
+}
+
+
+// ( sub += TestIndentation | items += Line ) *
+protected class TestIndentation_0_1_Alternatives extends AlternativesToken {
+
+	public TestIndentation_0_1_Alternatives(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, IS_MANY, !IS_REQUIRED);
+	}
+	
+	public Alternatives getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestIndentation().ele01Alternatives();
+	}
+	
+	protected Solution createSolution() {
+		AbstractToken t = (first) ? new TestIndentation_0_1_1_Assignment_items(current, this) : new TestIndentation_0_1_0_Assignment_sub(current, this);
+		Solution s = t.firstSolution();
+		if(s == null && activateNextSolution()) s = createSolution();
+		if(s == null) return null;
+		last = s.getPredecessor();
+		return s; 
+	}
+}
+
+// sub += TestIndentation
+protected class TestIndentation_0_1_0_Assignment_sub extends AssignmentToken  {
+	
+	public TestIndentation_0_1_0_Assignment_sub(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Assignment getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestIndentation().ele010AssignmentSub();
+	}
+	
+	protected Solution createSolution() {
+		if((value = current.getConsumable("sub",IS_REQUIRED)) == null) return null;
+		IInstanceDescription obj = current.cloneAndConsume("sub");
+		if(value instanceof EObject) { // xtext::RuleCall
+			IInstanceDescription param = getDescr((EObject)value);
+			if(param.isInstanceOf("TestIndentation")) {
+				Solution s = new TestIndentation_Group(param, this).firstSolution();
+				if(s != null) {
+					type = AssignmentType.PRC; 
+					return new Solution(obj,s.getPredecessor());
+				} 
+			}
+		}
+		return null;
+	}
+}
+
+// items += Line
+protected class TestIndentation_0_1_1_Assignment_items extends AssignmentToken  {
+	
+	public TestIndentation_0_1_1_Assignment_items(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Assignment getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestIndentation().ele011AssignmentItems();
+	}
+	
+	protected Solution createSolution() {
+		if((value = current.getConsumable("items",IS_REQUIRED)) == null) return null;
+		IInstanceDescription obj = current.cloneAndConsume("items");
+		if(value instanceof EObject) { // xtext::RuleCall
+			IInstanceDescription param = getDescr((EObject)value);
+			if(param.isInstanceOf("Line")) {
+				Solution s = new Line_Group(param, this).firstSolution();
+				if(s != null) {
+					type = AssignmentType.PRC; 
+					return new Solution(obj,s.getPredecessor());
+				} 
+			}
+		}
+		return null;
+	}
+}
+
+
+
+// '}'
+protected class TestIndentation_1_Keyword extends KeywordToken  {
+	
+	public TestIndentation_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
+		super(curr, pred, !IS_MANY, IS_REQUIRED);
+	}
+	
+	public Keyword getGrammarElement() {
+		return FormatterTestLanguageGrammarAccess.INSTANCE.prTestIndentation().ele1KeywordRightCurlyBracket();
+	}	
+}
+
+
+/************ end Rule TestIndentation ****************/
+
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java
new file mode 100644
index 0000000..78691c2
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageGrammarAccess.java
@@ -0,0 +1,192 @@
+/*
+Generated with Xtext
+*/
+
+package org.eclipse.xtext.parsetree.formatter.services;
+
+import org.eclipse.xtext.*;
+import org.eclipse.xtext.parser.BaseEPackageAccess;
+import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
+
+public class FormatterTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
+	
+	public class RootElements implements IParserRuleAccess {
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordTest = (Keyword)cGroup.eContents().get(0);
+		private final Alternatives c1Alternatives = (Alternatives)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallTestLinewrap = (RuleCall)c1Alternatives.eContents().get(0);
+		private final RuleCall c11ParserRuleCallTestIndentation = (RuleCall)c1Alternatives.eContents().get(1);
+		
+		// Root : 'test' ( TestLinewrap | TestIndentation ) ;
+		public ParserRule getRule() { return rule; }
+
+		// 'test' ( TestLinewrap | TestIndentation )
+		public Group eleGroup() { return cGroup; }
+
+		// 'test'
+		public Keyword ele0KeywordTest() { return c0KeywordTest; }
+
+		// TestLinewrap | TestIndentation
+		public Alternatives ele1Alternatives() { return c1Alternatives; }
+
+		// TestLinewrap
+		public RuleCall ele10ParserRuleCallTestLinewrap() { return c10ParserRuleCallTestLinewrap; }
+
+		// TestIndentation
+		public RuleCall ele11ParserRuleCallTestIndentation() { return c11ParserRuleCallTestIndentation; }
+	}
+
+	public class LineElements implements IParserRuleAccess {
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Assignment c00AssignmentType = (Assignment)c0Group.eContents().get(0);
+		private final RuleCall c000LexerRuleCallID = (RuleCall)c00AssignmentType.eContents().get(0);
+		private final Assignment c01AssignmentName = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallID = (RuleCall)c01AssignmentName.eContents().get(0);
+		private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1);
+		
+		// Line : type += ID name += ID ';' ;
+		public ParserRule getRule() { return rule; }
+
+		// type += ID name += ID ';'
+		public Group eleGroup() { return cGroup; }
+
+		// type += ID name += ID
+		public Group ele0Group() { return c0Group; }
+
+		// type += ID
+		public Assignment ele00AssignmentType() { return c00AssignmentType; }
+
+		// ID
+		public RuleCall ele000LexerRuleCallID() { return c000LexerRuleCallID; }
+
+		// name += ID
+		public Assignment ele01AssignmentName() { return c01AssignmentName; }
+
+		// ID
+		public RuleCall ele010LexerRuleCallID() { return c010LexerRuleCallID; }
+
+		// ';'
+		public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; }
+	}
+
+	public class TestLinewrapElements implements IParserRuleAccess {
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordLinewrap = (Keyword)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentItems = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallLine = (RuleCall)c1AssignmentItems.eContents().get(0);
+		
+		// TestLinewrap : 'linewrap' ( items += Line ) * ;
+		public ParserRule getRule() { return rule; }
+
+		// 'linewrap' ( items += Line ) *
+		public Group eleGroup() { return cGroup; }
+
+		// 'linewrap'
+		public Keyword ele0KeywordLinewrap() { return c0KeywordLinewrap; }
+
+		// ( items += Line ) *
+		public Assignment ele1AssignmentItems() { return c1AssignmentItems; }
+
+		// Line
+		public RuleCall ele10ParserRuleCallLine() { return c10ParserRuleCallLine; }
+	}
+
+	public class TestIndentationElements implements IParserRuleAccess {
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordIndentation = (Keyword)c00Group.eContents().get(0);
+		private final Keyword c001KeywordLeftCurlyBracket = (Keyword)c00Group.eContents().get(1);
+		private final Alternatives c01Alternatives = (Alternatives)c0Group.eContents().get(1);
+		private final Assignment c010AssignmentSub = (Assignment)c01Alternatives.eContents().get(0);
+		private final RuleCall c0100ParserRuleCallTestIndentation = (RuleCall)c010AssignmentSub.eContents().get(0);
+		private final Assignment c011AssignmentItems = (Assignment)c01Alternatives.eContents().get(1);
+		private final RuleCall c0110ParserRuleCallLine = (RuleCall)c011AssignmentItems.eContents().get(0);
+		private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
+		
+		// TestIndentation : 'indentation' '{' ( sub += TestIndentation | items += Line ) * '}' ;
+		public ParserRule getRule() { return rule; }
+
+		// 'indentation' '{' ( sub += TestIndentation | items += Line ) * '}'
+		public Group eleGroup() { return cGroup; }
+
+		// 'indentation' '{' ( sub += TestIndentation | items += Line ) *
+		public Group ele0Group() { return c0Group; }
+
+		// 'indentation' '{'
+		public Group ele00Group() { return c00Group; }
+
+		// 'indentation'
+		public Keyword ele000KeywordIndentation() { return c000KeywordIndentation; }
+
+		// '{'
+		public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; }
+
+		// ( sub += TestIndentation | items += Line ) *
+		public Alternatives ele01Alternatives() { return c01Alternatives; }
+
+		// sub += TestIndentation
+		public Assignment ele010AssignmentSub() { return c010AssignmentSub; }
+
+		// TestIndentation
+		public RuleCall ele0100ParserRuleCallTestIndentation() { return c0100ParserRuleCallTestIndentation; }
+
+		// items += Line
+		public Assignment ele011AssignmentItems() { return c011AssignmentItems; }
+
+		// Line
+		public RuleCall ele0110ParserRuleCallLine() { return c0110ParserRuleCallLine; }
+
+		// '}'
+		public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
+	}
+	
+	public final static FormatterTestLanguageGrammarAccess INSTANCE = new FormatterTestLanguageGrammarAccess();
+
+	private static final String FORMATTERTESTLANGUAGE_GRAMMAR_CP_URI = "classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi";
+	private static Grammar GRAMMAR = null;
+	private static RootElements pRoot;
+	private static LineElements pLine;
+	private static TestLinewrapElements pTestLinewrap;
+	private static TestIndentationElements pTestIndentation;
+
+	@SuppressWarnings("unused")
+	public synchronized Grammar getGrammar() {	
+		if (GRAMMAR==null) {
+			// assert the XtextPackage implementation is loaded
+			XtextPackage xtextPackage = XtextPackage.eINSTANCE;
+			GRAMMAR = (Grammar) loadGrammarFile(FormatterTestLanguageGrammarAccess.class.getClassLoader(),FORMATTERTESTLANGUAGE_GRAMMAR_CP_URI);
+		}
+		return GRAMMAR;
+	}
+	
+	public XtextBuiltinGrammarAccess getSuperGrammar() {
+		return XtextBuiltinGrammarAccess.INSTANCE;		
+	}
+
+	
+	// Root : 'test' ( TestLinewrap | TestIndentation ) ;
+	public RootElements prRoot() {
+		return (pRoot != null) ? pRoot : (pRoot = new RootElements());
+	} 
+
+	// Line : type += ID name += ID ';' ;
+	public LineElements prLine() {
+		return (pLine != null) ? pLine : (pLine = new LineElements());
+	} 
+
+	// TestLinewrap : 'linewrap' ( items += Line ) * ;
+	public TestLinewrapElements prTestLinewrap() {
+		return (pTestLinewrap != null) ? pTestLinewrap : (pTestLinewrap = new TestLinewrapElements());
+	} 
+
+	// TestIndentation : 'indentation' '{' ( sub += TestIndentation | items += Line ) * '}' ;
+	public TestIndentationElements prTestIndentation() {
+		return (pTestIndentation != null) ? pTestIndentation : (pTestIndentation = new TestIndentationElements());
+	} 
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageMetamodelAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageMetamodelAccess.java
new file mode 100644
index 0000000..1b55bbe
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageMetamodelAccess.java
@@ -0,0 +1,51 @@
+/*
+Generated with Xtext
+*/
+package org.eclipse.xtext.parsetree.formatter.services;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.IMetamodelAccess;
+import org.eclipse.xtext.parser.BaseEPackageAccess;
+
+public class FormatterTestLanguageMetamodelAccess extends BaseEPackageAccess implements IMetamodelAccess {
+
+{
+
+		if (!EPackage.Registry.INSTANCE.containsKey(FORMATTERTESTLANGUAGE_NS_URI))
+			EPackage.Registry.INSTANCE.put(FORMATTERTESTLANGUAGE_NS_URI, loadEcoreFile(getClass().getClassLoader(), "classpath:/org/eclipse/xtext/parsetree/formatter/formattertestlanguage.ecore"));
+
+}
+
+	private EPackage[] generated = new EPackage[] {
+		
+		getFormattertestlanguageEPackage()
+		
+		};
+
+	public EPackage[] getGeneratedEPackages() {
+		return generated;
+	}
+
+	private EPackage[] referenced = new EPackage[] {
+		
+		};
+	public EPackage[] getReferencedEPackages() {
+		return referenced;
+	}
+	
+	private EPackage[] all = new EPackage[] {
+	    getFormattertestlanguageEPackage()
+		};
+	
+	public EPackage[] getAllEPackages() {
+		return all;
+	}
+
+	
+	protected static final String FORMATTERTESTLANGUAGE_NS_URI = "http://simple/formattertestlanguage";
+	
+	protected EPackage getFormattertestlanguageEPackage() {	
+		return EPackage.Registry.INSTANCE.getEPackage(FORMATTERTESTLANGUAGE_NS_URI);
+	}
+	
+}
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageResourceFactory.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageResourceFactory.java
new file mode 100644
index 0000000..49282bd
--- a/dev/null
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/services/FormatterTestLanguageResourceFactory.java
@@ -0,0 +1,28 @@
+/*
+Generated with Xtext
+*/
+package org.eclipse.xtext.parsetree.formatter.services;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.resource.IResourceFactory;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.service.ServiceRegistry;
+import org.eclipse.xtext.service.ServiceScopeFactory;
+
+public class FormatterTestLanguageResourceFactory implements IResourceFactory {
+
+	public String[] getModelFileExtensions() {
+		return new String[] { "formattertestlanguage" };
+	}
+	
+	 /* (non-Javadoc)
+     * @see org.eclipse.emf.ecore.resource.Resource.Factory#createResource(org.eclipse.emf.common.util.URI)
+     */
+    public Resource createResource(URI uri) {
+        XtextResource resource = new XtextResource(uri);
+        ServiceRegistry.injectServices(ServiceScopeFactory.get("org.eclipse.xtext.parsetree.formatter.FormatterTestLanguage"), resource);
+        return resource;
+    }
+    
+} 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestLanguageParseTreeConstructor.java
index 6511e29..81120ee 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/XtextGrammarTestLanguageParseTreeConstructor.java
@@ -310,7 +310,7 @@ protected class Grammar_0_0_0_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prGrammar().ele00010Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prGrammar().ele00010KeywordFullStop();
 	}	
 }
 
@@ -467,7 +467,7 @@ protected class Grammar_0_0_1_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prGrammar().ele00110Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prGrammar().ele00110KeywordFullStop();
 	}	
 }
 
@@ -1370,7 +1370,7 @@ protected class LexerRule_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prLexerRule().ele001Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prLexerRule().ele001KeywordColon();
 	}	
 }
 
@@ -1407,7 +1407,7 @@ protected class LexerRule_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prLexerRule().ele1Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prLexerRule().ele1KeywordSemicolon();
 	}	
 }
 
@@ -1634,7 +1634,7 @@ protected class ParserRule_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prParserRule().ele001Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prParserRule().ele001KeywordColon();
 	}	
 }
 
@@ -1676,7 +1676,7 @@ protected class ParserRule_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prParserRule().ele1Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prParserRule().ele1KeywordSemicolon();
 	}	
 }
 
@@ -1780,7 +1780,7 @@ protected class TypeRef_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prTypeRef().ele01Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prTypeRef().ele01KeywordColonColon();
 	}	
 }
 
@@ -1951,7 +1951,7 @@ protected class Alternatives_1_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAlternatives().ele101Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAlternatives().ele101KeywordVerticalLine();
 	}	
 }
 
@@ -2270,17 +2270,17 @@ protected class AbstractToken_1_Assignment_cardinality extends AssignmentToken
 		IInstanceDescription obj = current.cloneAndConsume("cardinality");
 		if("?".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAbstractToken().ele1000Keyword();
+			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAbstractToken().ele1000KeywordQuestionMark();
 			return new Solution(obj);
 		}
 		if("*".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAbstractToken().ele1001Keyword();
+			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAbstractToken().ele1001KeywordAsterisk();
 			return new Solution(obj);
 		}
 		if("+".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAbstractToken().ele101Keyword();
+			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAbstractToken().ele101KeywordPlusSign();
 			return new Solution(obj);
 		}
 		return null;
@@ -2392,17 +2392,17 @@ protected class Assignment_0_1_Assignment_operator extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("operator");
 		if("+=".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAssignment().ele01000Keyword();
+			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAssignment().ele01000KeywordPlusSignEqualsSign();
 			return new Solution(obj);
 		}
 		if("=".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAssignment().ele01001Keyword();
+			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAssignment().ele01001KeywordEqualsSign();
 			return new Solution(obj);
 		}
 		if("?=".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAssignment().ele0101Keyword();
+			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAssignment().ele0101KeywordQuestionMarkEqualsSign();
 			return new Solution(obj);
 		}
 		return null;
@@ -2652,7 +2652,7 @@ protected class Action_0_0_0_0_0_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele0000000Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele0000000KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -2704,7 +2704,7 @@ protected class Action_0_0_0_0_0_0_1_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele00000011Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele00000011KeywordEqualsSign();
 	}	
 }
 
@@ -2747,7 +2747,7 @@ protected class Action_0_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele00001Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele00001KeywordFullStop();
 	}	
 }
 
@@ -2792,12 +2792,12 @@ protected class Action_0_0_1_Assignment_operator extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("operator");
 		if("=".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele00100Keyword();
+			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele00100KeywordEqualsSign();
 			return new Solution(obj);
 		}
 		if("+=".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele00101Keyword();
+			element = XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele00101KeywordPlusSignEqualsSign();
 			return new Solution(obj);
 		}
 		return null;
@@ -2826,7 +2826,7 @@ protected class Action_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele1Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prAction().ele1KeywordRightCurlyBracket();
 	}	
 }
 
@@ -3079,7 +3079,7 @@ protected class CrossReference_0_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prCrossReference().ele000Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prCrossReference().ele000KeywordLeftSquareBracket();
 	}	
 }
 
@@ -3148,7 +3148,7 @@ protected class CrossReference_0_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prCrossReference().ele010Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prCrossReference().ele010KeywordVerticalLine();
 	}	
 }
 
@@ -3188,7 +3188,7 @@ protected class CrossReference_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prCrossReference().ele1Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prCrossReference().ele1KeywordRightSquareBracket();
 	}	
 }
 
@@ -3266,7 +3266,7 @@ protected class ParenthesizedElement_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prParenthesizedElement().ele00Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prParenthesizedElement().ele00KeywordLeftParenthesis();
 	}	
 }
 
@@ -3297,7 +3297,7 @@ protected class ParenthesizedElement_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prParenthesizedElement().ele1Keyword();
+		return XtextGrammarTestLanguageGrammarAccess.INSTANCE.prParenthesizedElement().ele1KeywordRightParenthesis();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java
index fc2ef22..f3bf0e9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-10 12:15:40
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-10 15:09:18
 
 package org.eclipse.xtext.parsetree.reconstr.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java
index 2c6b5a9..6794742 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-10 12:15:40
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-10 15:09:18
 
 package org.eclipse.xtext.parsetree.reconstr.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java
index 14fd12b..19915da 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2008-12-10 12:15:39
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2008-12-10 15:09:17
 
 package org.eclipse.xtext.parsetree.reconstr.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageParser.java
index 57d621c..fe4f4b7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2008-12-10 12:15:39
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2008-12-10 15:09:17
 
 package org.eclipse.xtext.parsetree.reconstr.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestLanguageParseTreeConstructor.java
index e972f89..867f2d9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/ComplexReconstrTestLanguageParseTreeConstructor.java
@@ -197,7 +197,7 @@ protected class Op_1_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prOp().ele1001Keyword();
+		return ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prOp().ele1001KeywordPlusSign();
 	}	
 }
 
@@ -315,7 +315,7 @@ protected class Op_1_1_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prOp().ele1101Keyword();
+		return ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prOp().ele1101KeywordHyphenMinus();
 	}	
 }
 
@@ -551,7 +551,7 @@ protected class Parens_0_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele000Keyword();
+		return ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele000KeywordLeftParenthesis();
 	}	
 }
 
@@ -582,7 +582,7 @@ protected class Parens_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele01Keyword();
+		return ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele01KeywordRightParenthesis();
 	}	
 }
 
@@ -603,7 +603,7 @@ protected class Parens_1_Assignment_em extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("em");
 		if("!".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele10Keyword();
+			element = ComplexReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele10KeywordExclamationMark();
 			return new Solution(obj);
 		}
 		return null;
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestLanguageParseTreeConstructor.java
index 407753a..e882e08 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parsetree/reconstr/SimpleReconstrTestLanguageParseTreeConstructor.java
@@ -568,7 +568,7 @@ protected class Parens_0_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele000Keyword();
+		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele000KeywordLeftParenthesis();
 	}	
 }
 
@@ -599,7 +599,7 @@ protected class Parens_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele01Keyword();
+		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele01KeywordRightParenthesis();
 	}	
 }
 
@@ -620,7 +620,7 @@ protected class Parens_1_Assignment_em extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("em");
 		if("!".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele10Keyword();
+			element = SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prParens().ele10KeywordExclamationMark();
 			return new Solution(obj);
 		}
 		return null;
@@ -776,7 +776,7 @@ protected class TwoNumbers_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prTwoNumbers().ele10Keyword();
+		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prTwoNumbers().ele10KeywordNumberSign();
 	}	
 }
 
@@ -878,7 +878,7 @@ protected class ManyStrings_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prManyStrings().ele00Keyword();
+		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prManyStrings().ele00KeywordEqualsSign();
 	}	
 }
 
@@ -1144,7 +1144,7 @@ protected class Ref2_0_Keyword_2 extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prRef2().ele0Keyword();
+		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prRef2().ele0KeywordNumberSignDigitTwo();
 	}	
 }
 
@@ -1255,7 +1255,7 @@ protected class Spare_0_0_Keyword_3 extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prSpare().ele00Keyword();
+		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prSpare().ele00KeywordNumberSignDigitThree();
 	}	
 }
 
@@ -1319,7 +1319,7 @@ protected class Spare_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prSpare().ele10Keyword();
+		return SimpleReconstrTestLanguageGrammarAccess.INSTANCE.prSpare().ele10KeywordFullStop();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java
index 4ae7b25..24a09f3 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/ComplexReconstrTestLanguageGrammarAccess.java
@@ -11,840 +11,572 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class ComplexReconstrTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class OpElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private RuleCall c0ParserRuleCallTerm;
-		private Alternatives c1Alternatives;
-		private Group c10Group;
-		private Group c100Group;
-		private Action c1000ActionAddaddOperands;
-		private Keyword c1001Keyword;
-		private Assignment c101AssignmentAddOperands;
-		private RuleCall c1010ParserRuleCallTerm;
-		private Group c11Group;
-		private Group c110Group;
-		private Action c1100ActionMinusminusOperands;
-		private Keyword c1101Keyword;
-		private Assignment c111AssignmentMinusOperands;
-		private RuleCall c1110ParserRuleCallTerm;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallTerm = (RuleCall)cGroup.eContents().get(0);
+		private final Alternatives c1Alternatives = (Alternatives)cGroup.eContents().get(1);
+		private final Group c10Group = (Group)c1Alternatives.eContents().get(0);
+		private final Group c100Group = (Group)c10Group.eContents().get(0);
+		private final Action c1000ActionAddaddOperands = (Action)c100Group.eContents().get(0);
+		private final Keyword c1001KeywordPlusSign = (Keyword)c100Group.eContents().get(1);
+		private final Assignment c101AssignmentAddOperands = (Assignment)c10Group.eContents().get(1);
+		private final RuleCall c1010ParserRuleCallTerm = (RuleCall)c101AssignmentAddOperands.eContents().get(0);
+		private final Group c11Group = (Group)c1Alternatives.eContents().get(1);
+		private final Group c110Group = (Group)c11Group.eContents().get(0);
+		private final Action c1100ActionMinusminusOperands = (Action)c110Group.eContents().get(0);
+		private final Keyword c1101KeywordHyphenMinus = (Keyword)c110Group.eContents().get(1);
+		private final Assignment c111AssignmentMinusOperands = (Assignment)c11Group.eContents().get(1);
+		private final RuleCall c1110ParserRuleCallTerm = (RuleCall)c111AssignmentMinusOperands.eContents().get(0);
 		
 		// Op returns Expression : Term ( { current = Add . addOperands += current } '+' addOperands += Term | { current = Minus . minusOperands += current } '-' minusOperands += Term ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// Term ( { current = Add . addOperands += current } '+' addOperands += Term | { current = Minus . minusOperands += current } '-' minusOperands += Term ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// Term
-		public RuleCall ele0ParserRuleCallTerm() {
-			return (c0ParserRuleCallTerm != null) ? c0ParserRuleCallTerm : (c0ParserRuleCallTerm = (RuleCall)eleGroup().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallTerm() { return c0ParserRuleCallTerm; }
 
 		// ( { current = Add . addOperands += current } '+' addOperands += Term | { current = Minus . minusOperands += current } '-' minusOperands += Term ) *
-		public Alternatives ele1Alternatives() {
-			return (c1Alternatives != null) ? c1Alternatives : (c1Alternatives = (Alternatives)eleGroup().eContents().get(1)); 
-		}
+		public Alternatives ele1Alternatives() { return c1Alternatives; }
 
 		// { current = Add . addOperands += current } '+' addOperands += Term
-		public Group ele10Group() {
-			return (c10Group != null) ? c10Group : (c10Group = (Group)ele1Alternatives().eContents().get(0)); 
-		}
+		public Group ele10Group() { return c10Group; }
 
 		// { current = Add . addOperands += current } '+'
-		public Group ele100Group() {
-			return (c100Group != null) ? c100Group : (c100Group = (Group)ele10Group().eContents().get(0)); 
-		}
+		public Group ele100Group() { return c100Group; }
 
 		// { current = Add . addOperands += current }
-		public Action ele1000ActionAddaddOperands() {
-			return (c1000ActionAddaddOperands != null) ? c1000ActionAddaddOperands : (c1000ActionAddaddOperands = (Action)ele100Group().eContents().get(0)); 
-		}
+		public Action ele1000ActionAddaddOperands() { return c1000ActionAddaddOperands; }
 
 		// '+'
-		public Keyword ele1001Keyword() {
-			return (c1001Keyword != null) ? c1001Keyword : (c1001Keyword = (Keyword)ele100Group().eContents().get(1)); 
-		}
+		public Keyword ele1001KeywordPlusSign() { return c1001KeywordPlusSign; }
 
 		// addOperands += Term
-		public Assignment ele101AssignmentAddOperands() {
-			return (c101AssignmentAddOperands != null) ? c101AssignmentAddOperands : (c101AssignmentAddOperands = (Assignment)ele10Group().eContents().get(1)); 
-		}
+		public Assignment ele101AssignmentAddOperands() { return c101AssignmentAddOperands; }
 
 		// Term
-		public RuleCall ele1010ParserRuleCallTerm() {
-			return (c1010ParserRuleCallTerm != null) ? c1010ParserRuleCallTerm : (c1010ParserRuleCallTerm = (RuleCall)ele101AssignmentAddOperands().eContents().get(0)); 
-		}
+		public RuleCall ele1010ParserRuleCallTerm() { return c1010ParserRuleCallTerm; }
 
 		// { current = Minus . minusOperands += current } '-' minusOperands += Term
-		public Group ele11Group() {
-			return (c11Group != null) ? c11Group : (c11Group = (Group)ele1Alternatives().eContents().get(1)); 
-		}
+		public Group ele11Group() { return c11Group; }
 
 		// { current = Minus . minusOperands += current } '-'
-		public Group ele110Group() {
-			return (c110Group != null) ? c110Group : (c110Group = (Group)ele11Group().eContents().get(0)); 
-		}
+		public Group ele110Group() { return c110Group; }
 
 		// { current = Minus . minusOperands += current }
-		public Action ele1100ActionMinusminusOperands() {
-			return (c1100ActionMinusminusOperands != null) ? c1100ActionMinusminusOperands : (c1100ActionMinusminusOperands = (Action)ele110Group().eContents().get(0)); 
-		}
+		public Action ele1100ActionMinusminusOperands() { return c1100ActionMinusminusOperands; }
 
 		// '-'
-		public Keyword ele1101Keyword() {
-			return (c1101Keyword != null) ? c1101Keyword : (c1101Keyword = (Keyword)ele110Group().eContents().get(1)); 
-		}
+		public Keyword ele1101KeywordHyphenMinus() { return c1101KeywordHyphenMinus; }
 
 		// minusOperands += Term
-		public Assignment ele111AssignmentMinusOperands() {
-			return (c111AssignmentMinusOperands != null) ? c111AssignmentMinusOperands : (c111AssignmentMinusOperands = (Assignment)ele11Group().eContents().get(1)); 
-		}
+		public Assignment ele111AssignmentMinusOperands() { return c111AssignmentMinusOperands; }
 
 		// Term
-		public RuleCall ele1110ParserRuleCallTerm() {
-			return (c1110ParserRuleCallTerm != null) ? c1110ParserRuleCallTerm : (c1110ParserRuleCallTerm = (RuleCall)ele111AssignmentMinusOperands().eContents().get(0)); 
-		}
+		public RuleCall ele1110ParserRuleCallTerm() { return c1110ParserRuleCallTerm; }
 	}
 
 	public class TermElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private RuleCall c0ParserRuleCallAtom;
-		private RuleCall c1ParserRuleCallParens;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallAtom = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall c1ParserRuleCallParens = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// Term returns Expression : Atom | Parens ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// Atom | Parens
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// Atom
-		public RuleCall ele0ParserRuleCallAtom() {
-			return (c0ParserRuleCallAtom != null) ? c0ParserRuleCallAtom : (c0ParserRuleCallAtom = (RuleCall)eleAlternatives().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallAtom() { return c0ParserRuleCallAtom; }
 
 		// Parens
-		public RuleCall ele1ParserRuleCallParens() {
-			return (c1ParserRuleCallParens != null) ? c1ParserRuleCallParens : (c1ParserRuleCallParens = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallParens() { return c1ParserRuleCallParens; }
 	}
 
 	public class AtomElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentName;
-		private RuleCall c0LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Assignment cAssignmentName = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0LexerRuleCallID = (RuleCall)cAssignmentName.eContents().get(0);
 		
 		// Atom : name = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID
-		public Assignment eleAssignmentName() {
-			return (cAssignmentName != null) ? cAssignmentName : (cAssignmentName = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentName() { return cAssignmentName; }
 
 		// ID
-		public RuleCall ele0LexerRuleCallID() {
-			return (c0LexerRuleCallID != null) ? c0LexerRuleCallID : (c0LexerRuleCallID = (RuleCall)eleAssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0LexerRuleCallID() { return c0LexerRuleCallID; }
 	}
 
 	public class ParensElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000Keyword;
-		private RuleCall c001ParserRuleCallOp;
-		private Keyword c01Keyword;
-		private Assignment c1AssignmentEm;
-		private Keyword c10Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordLeftParenthesis = (Keyword)c00Group.eContents().get(0);
+		private final RuleCall c001ParserRuleCallOp = (RuleCall)c00Group.eContents().get(1);
+		private final Keyword c01KeywordRightParenthesis = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentEm = (Assignment)cGroup.eContents().get(1);
+		private final Keyword c10KeywordExclamationMark = (Keyword)c1AssignmentEm.eContents().get(0);
 		
 		// Parens returns Expression : '(' Op ')' ( em = '!' ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '(' Op ')' ( em = '!' ) ?
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '(' Op ')'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '(' Op
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// '('
-		public Keyword ele000Keyword() {
-			return (c000Keyword != null) ? c000Keyword : (c000Keyword = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordLeftParenthesis() { return c000KeywordLeftParenthesis; }
 
 		// Op
-		public RuleCall ele001ParserRuleCallOp() {
-			return (c001ParserRuleCallOp != null) ? c001ParserRuleCallOp : (c001ParserRuleCallOp = (RuleCall)ele00Group().eContents().get(1)); 
-		}
+		public RuleCall ele001ParserRuleCallOp() { return c001ParserRuleCallOp; }
 
 		// ')'
-		public Keyword ele01Keyword() {
-			return (c01Keyword != null) ? c01Keyword : (c01Keyword = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordRightParenthesis() { return c01KeywordRightParenthesis; }
 
 		// ( em = '!' ) ?
-		public Assignment ele1AssignmentEm() {
-			return (c1AssignmentEm != null) ? c1AssignmentEm : (c1AssignmentEm = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentEm() { return c1AssignmentEm; }
 
 		// '!'
-		public Keyword ele10Keyword() {
-			return (c10Keyword != null) ? c10Keyword : (c10Keyword = (Keyword)ele1AssignmentEm().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordExclamationMark() { return c10KeywordExclamationMark; }
 	}
 
 	public class TrickyAElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000KeywordTA;
-		private RuleCall c0001ParserRuleCallTrickyA1;
-		private Assignment c001AssignmentName;
-		private RuleCall c0010LexerRuleCallID;
-		private Alternatives c01Alternatives;
-		private Group c010Group;
-		private Action c0100ActionTypeBx;
-		private Keyword c0101KeywordX;
-		private Group c011Group;
-		private Action c0110ActionTypeCx;
-		private Keyword c0111KeywordY;
-		private Assignment c1AssignmentName;
-		private RuleCall c10LexerRuleCallSTRING;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(5);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordTA = (Keyword)c000Group.eContents().get(0);
+		private final RuleCall c0001ParserRuleCallTrickyA1 = (RuleCall)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+		private final Alternatives c01Alternatives = (Alternatives)c0Group.eContents().get(1);
+		private final Group c010Group = (Group)c01Alternatives.eContents().get(0);
+		private final Action c0100ActionTypeBx = (Action)c010Group.eContents().get(0);
+		private final Keyword c0101KeywordX = (Keyword)c010Group.eContents().get(1);
+		private final Group c011Group = (Group)c01Alternatives.eContents().get(1);
+		private final Action c0110ActionTypeCx = (Action)c011Group.eContents().get(0);
+		private final Keyword c0111KeywordY = (Keyword)c011Group.eContents().get(1);
+		private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallSTRING = (RuleCall)c1AssignmentName.eContents().get(0);
 		
 		// TrickyA returns TypeA1 : 'TA' TrickyA1 ( name += ID ) * ( { current = TypeB . x = current } 'x' | { current = TypeC . x = current } 'y' ) ? name += STRING ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(5)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'TA' TrickyA1 ( name += ID ) * ( { current = TypeB . x = current } 'x' | { current = TypeC . x = current } 'y' ) ? name += STRING
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'TA' TrickyA1 ( name += ID ) * ( { current = TypeB . x = current } 'x' | { current = TypeC . x = current } 'y' ) ?
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'TA' TrickyA1 ( name += ID ) *
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'TA' TrickyA1
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'TA'
-		public Keyword ele0000KeywordTA() {
-			return (c0000KeywordTA != null) ? c0000KeywordTA : (c0000KeywordTA = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordTA() { return c0000KeywordTA; }
 
 		// TrickyA1
-		public RuleCall ele0001ParserRuleCallTrickyA1() {
-			return (c0001ParserRuleCallTrickyA1 != null) ? c0001ParserRuleCallTrickyA1 : (c0001ParserRuleCallTrickyA1 = (RuleCall)ele000Group().eContents().get(1)); 
-		}
+		public RuleCall ele0001ParserRuleCallTrickyA1() { return c0001ParserRuleCallTrickyA1; }
 
 		// ( name += ID ) *
-		public Assignment ele001AssignmentName() {
-			return (c001AssignmentName != null) ? c001AssignmentName : (c001AssignmentName = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentName() { return c001AssignmentName; }
 
 		// ID
-		public RuleCall ele0010LexerRuleCallID() {
-			return (c0010LexerRuleCallID != null) ? c0010LexerRuleCallID : (c0010LexerRuleCallID = (RuleCall)ele001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
 
 		// ( { current = TypeB . x = current } 'x' | { current = TypeC . x = current } 'y' ) ?
-		public Alternatives ele01Alternatives() {
-			return (c01Alternatives != null) ? c01Alternatives : (c01Alternatives = (Alternatives)ele0Group().eContents().get(1)); 
-		}
+		public Alternatives ele01Alternatives() { return c01Alternatives; }
 
 		// { current = TypeB . x = current } 'x'
-		public Group ele010Group() {
-			return (c010Group != null) ? c010Group : (c010Group = (Group)ele01Alternatives().eContents().get(0)); 
-		}
+		public Group ele010Group() { return c010Group; }
 
 		// { current = TypeB . x = current }
-		public Action ele0100ActionTypeBx() {
-			return (c0100ActionTypeBx != null) ? c0100ActionTypeBx : (c0100ActionTypeBx = (Action)ele010Group().eContents().get(0)); 
-		}
+		public Action ele0100ActionTypeBx() { return c0100ActionTypeBx; }
 
 		// 'x'
-		public Keyword ele0101KeywordX() {
-			return (c0101KeywordX != null) ? c0101KeywordX : (c0101KeywordX = (Keyword)ele010Group().eContents().get(1)); 
-		}
+		public Keyword ele0101KeywordX() { return c0101KeywordX; }
 
 		// { current = TypeC . x = current } 'y'
-		public Group ele011Group() {
-			return (c011Group != null) ? c011Group : (c011Group = (Group)ele01Alternatives().eContents().get(1)); 
-		}
+		public Group ele011Group() { return c011Group; }
 
 		// { current = TypeC . x = current }
-		public Action ele0110ActionTypeCx() {
-			return (c0110ActionTypeCx != null) ? c0110ActionTypeCx : (c0110ActionTypeCx = (Action)ele011Group().eContents().get(0)); 
-		}
+		public Action ele0110ActionTypeCx() { return c0110ActionTypeCx; }
 
 		// 'y'
-		public Keyword ele0111KeywordY() {
-			return (c0111KeywordY != null) ? c0111KeywordY : (c0111KeywordY = (Keyword)ele011Group().eContents().get(1)); 
-		}
+		public Keyword ele0111KeywordY() { return c0111KeywordY; }
 
 		// name += STRING
-		public Assignment ele1AssignmentName() {
-			return (c1AssignmentName != null) ? c1AssignmentName : (c1AssignmentName = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentName() { return c1AssignmentName; }
 
 		// STRING
-		public RuleCall ele10LexerRuleCallSTRING() {
-			return (c10LexerRuleCallSTRING != null) ? c10LexerRuleCallSTRING : (c10LexerRuleCallSTRING = (RuleCall)ele1AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallSTRING() { return c10LexerRuleCallSTRING; }
 	}
 
 	public class TrickyA1Elements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentName;
-		private RuleCall c0LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(6);
+		private final Assignment cAssignmentName = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0LexerRuleCallID = (RuleCall)cAssignmentName.eContents().get(0);
 		
 		// TrickyA1 returns TypeD : name += ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(6)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name += ID
-		public Assignment eleAssignmentName() {
-			return (cAssignmentName != null) ? cAssignmentName : (cAssignmentName = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentName() { return cAssignmentName; }
 
 		// ID
-		public RuleCall ele0LexerRuleCallID() {
-			return (c0LexerRuleCallID != null) ? c0LexerRuleCallID : (c0LexerRuleCallID = (RuleCall)eleAssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0LexerRuleCallID() { return c0LexerRuleCallID; }
 	}
 
 	public class TrickyBElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Keyword c00KeywordTB;
-		private Group c01Group;
-		private Assignment c010AssignmentName;
-		private RuleCall c0100LexerRuleCallID;
-		private Assignment c011AssignmentType;
-		private RuleCall c0110LexerRuleCallINT;
-		private Assignment c1AssignmentType;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(7);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Keyword c00KeywordTB = (Keyword)c0Group.eContents().get(0);
+		private final Group c01Group = (Group)c0Group.eContents().get(1);
+		private final Assignment c010AssignmentName = (Assignment)c01Group.eContents().get(0);
+		private final RuleCall c0100LexerRuleCallID = (RuleCall)c010AssignmentName.eContents().get(0);
+		private final Assignment c011AssignmentType = (Assignment)c01Group.eContents().get(1);
+		private final RuleCall c0110LexerRuleCallINT = (RuleCall)c011AssignmentType.eContents().get(0);
+		private final Assignment c1AssignmentType = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentType.eContents().get(0);
 		
 		// TrickyB : 'TB' ( name = ID type += INT ) ? ( type += ID ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(7)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'TB' ( name = ID type += INT ) ? ( type += ID ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'TB' ( name = ID type += INT ) ?
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'TB'
-		public Keyword ele00KeywordTB() {
-			return (c00KeywordTB != null) ? c00KeywordTB : (c00KeywordTB = (Keyword)ele0Group().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordTB() { return c00KeywordTB; }
 
 		// ( name = ID type += INT ) ?
-		public Group ele01Group() {
-			return (c01Group != null) ? c01Group : (c01Group = (Group)ele0Group().eContents().get(1)); 
-		}
+		public Group ele01Group() { return c01Group; }
 
 		// name = ID
-		public Assignment ele010AssignmentName() {
-			return (c010AssignmentName != null) ? c010AssignmentName : (c010AssignmentName = (Assignment)ele01Group().eContents().get(0)); 
-		}
+		public Assignment ele010AssignmentName() { return c010AssignmentName; }
 
 		// ID
-		public RuleCall ele0100LexerRuleCallID() {
-			return (c0100LexerRuleCallID != null) ? c0100LexerRuleCallID : (c0100LexerRuleCallID = (RuleCall)ele010AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0100LexerRuleCallID() { return c0100LexerRuleCallID; }
 
 		// type += INT
-		public Assignment ele011AssignmentType() {
-			return (c011AssignmentType != null) ? c011AssignmentType : (c011AssignmentType = (Assignment)ele01Group().eContents().get(1)); 
-		}
+		public Assignment ele011AssignmentType() { return c011AssignmentType; }
 
 		// INT
-		public RuleCall ele0110LexerRuleCallINT() {
-			return (c0110LexerRuleCallINT != null) ? c0110LexerRuleCallINT : (c0110LexerRuleCallINT = (RuleCall)ele011AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele0110LexerRuleCallINT() { return c0110LexerRuleCallINT; }
 
 		// ( type += ID ) *
-		public Assignment ele1AssignmentType() {
-			return (c1AssignmentType != null) ? c1AssignmentType : (c1AssignmentType = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentType() { return c1AssignmentType; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 
 	public class TrickyCElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000KeywordTC;
-		private Assignment c0001AssignmentName;
-		private RuleCall c00010LexerRuleCallID;
-		private Group c001Group;
-		private Action c0010ActionC1x;
-		private Keyword c0011KeywordX;
-		private Group c01Group;
-		private Action c010ActionC2y;
-		private Keyword c011KeywordY;
-		private Group c1Group;
-		private Action c10ActionC3z;
-		private Keyword c11KeywordZ;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(8);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordTC = (Keyword)c000Group.eContents().get(0);
+		private final Assignment c0001AssignmentName = (Assignment)c000Group.eContents().get(1);
+		private final RuleCall c00010LexerRuleCallID = (RuleCall)c0001AssignmentName.eContents().get(0);
+		private final Group c001Group = (Group)c00Group.eContents().get(1);
+		private final Action c0010ActionC1x = (Action)c001Group.eContents().get(0);
+		private final Keyword c0011KeywordX = (Keyword)c001Group.eContents().get(1);
+		private final Group c01Group = (Group)c0Group.eContents().get(1);
+		private final Action c010ActionC2y = (Action)c01Group.eContents().get(0);
+		private final Keyword c011KeywordY = (Keyword)c01Group.eContents().get(1);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Action c10ActionC3z = (Action)c1Group.eContents().get(0);
+		private final Keyword c11KeywordZ = (Keyword)c1Group.eContents().get(1);
 		
 		// TrickyC : 'TC' name = ID ( { current = C1 . x = current } 'x' ) ? ( { current = C2 . y = current } 'y' ) ? ( { current = C3 . z = current } 'z' ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(8)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'TC' name = ID ( { current = C1 . x = current } 'x' ) ? ( { current = C2 . y = current } 'y' ) ? ( { current = C3 . z = current } 'z' ) ?
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'TC' name = ID ( { current = C1 . x = current } 'x' ) ? ( { current = C2 . y = current } 'y' ) ?
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'TC' name = ID ( { current = C1 . x = current } 'x' ) ?
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'TC' name = ID
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'TC'
-		public Keyword ele0000KeywordTC() {
-			return (c0000KeywordTC != null) ? c0000KeywordTC : (c0000KeywordTC = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordTC() { return c0000KeywordTC; }
 
 		// name = ID
-		public Assignment ele0001AssignmentName() {
-			return (c0001AssignmentName != null) ? c0001AssignmentName : (c0001AssignmentName = (Assignment)ele000Group().eContents().get(1)); 
-		}
+		public Assignment ele0001AssignmentName() { return c0001AssignmentName; }
 
 		// ID
-		public RuleCall ele00010LexerRuleCallID() {
-			return (c00010LexerRuleCallID != null) ? c00010LexerRuleCallID : (c00010LexerRuleCallID = (RuleCall)ele0001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00010LexerRuleCallID() { return c00010LexerRuleCallID; }
 
 		// ( { current = C1 . x = current } 'x' ) ?
-		public Group ele001Group() {
-			return (c001Group != null) ? c001Group : (c001Group = (Group)ele00Group().eContents().get(1)); 
-		}
+		public Group ele001Group() { return c001Group; }
 
 		// { current = C1 . x = current }
-		public Action ele0010ActionC1x() {
-			return (c0010ActionC1x != null) ? c0010ActionC1x : (c0010ActionC1x = (Action)ele001Group().eContents().get(0)); 
-		}
+		public Action ele0010ActionC1x() { return c0010ActionC1x; }
 
 		// 'x'
-		public Keyword ele0011KeywordX() {
-			return (c0011KeywordX != null) ? c0011KeywordX : (c0011KeywordX = (Keyword)ele001Group().eContents().get(1)); 
-		}
+		public Keyword ele0011KeywordX() { return c0011KeywordX; }
 
 		// ( { current = C2 . y = current } 'y' ) ?
-		public Group ele01Group() {
-			return (c01Group != null) ? c01Group : (c01Group = (Group)ele0Group().eContents().get(1)); 
-		}
+		public Group ele01Group() { return c01Group; }
 
 		// { current = C2 . y = current }
-		public Action ele010ActionC2y() {
-			return (c010ActionC2y != null) ? c010ActionC2y : (c010ActionC2y = (Action)ele01Group().eContents().get(0)); 
-		}
+		public Action ele010ActionC2y() { return c010ActionC2y; }
 
 		// 'y'
-		public Keyword ele011KeywordY() {
-			return (c011KeywordY != null) ? c011KeywordY : (c011KeywordY = (Keyword)ele01Group().eContents().get(1)); 
-		}
+		public Keyword ele011KeywordY() { return c011KeywordY; }
 
 		// ( { current = C3 . z = current } 'z' ) ?
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// { current = C3 . z = current }
-		public Action ele10ActionC3z() {
-			return (c10ActionC3z != null) ? c10ActionC3z : (c10ActionC3z = (Action)ele1Group().eContents().get(0)); 
-		}
+		public Action ele10ActionC3z() { return c10ActionC3z; }
 
 		// 'z'
-		public Keyword ele11KeywordZ() {
-			return (c11KeywordZ != null) ? c11KeywordZ : (c11KeywordZ = (Keyword)ele1Group().eContents().get(1)); 
-		}
+		public Keyword ele11KeywordZ() { return c11KeywordZ; }
 	}
 
 	public class TrickyDElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordTD;
-		private Group c001Group;
-		private Group c0010Group;
-		private Assignment c00100AssignmentName;
-		private RuleCall c001000LexerRuleCallINT;
-		private Assignment c00101AssignmentFoo;
-		private RuleCall c001010LexerRuleCallSTRING;
-		private Assignment c0011AssignmentType;
-		private RuleCall c00110LexerRuleCallID;
-		private Group c01Group;
-		private Assignment c010AssignmentName;
-		private RuleCall c0100LexerRuleCallINT;
-		private Assignment c011AssignmentType;
-		private RuleCall c0110LexerRuleCallID;
-		private Assignment c1AssignmentType;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(9);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordTD = (Keyword)c00Group.eContents().get(0);
+		private final Group c001Group = (Group)c00Group.eContents().get(1);
+		private final Group c0010Group = (Group)c001Group.eContents().get(0);
+		private final Assignment c00100AssignmentName = (Assignment)c0010Group.eContents().get(0);
+		private final RuleCall c001000LexerRuleCallINT = (RuleCall)c00100AssignmentName.eContents().get(0);
+		private final Assignment c00101AssignmentFoo = (Assignment)c0010Group.eContents().get(1);
+		private final RuleCall c001010LexerRuleCallSTRING = (RuleCall)c00101AssignmentFoo.eContents().get(0);
+		private final Assignment c0011AssignmentType = (Assignment)c001Group.eContents().get(1);
+		private final RuleCall c00110LexerRuleCallID = (RuleCall)c0011AssignmentType.eContents().get(0);
+		private final Group c01Group = (Group)c0Group.eContents().get(1);
+		private final Assignment c010AssignmentName = (Assignment)c01Group.eContents().get(0);
+		private final RuleCall c0100LexerRuleCallINT = (RuleCall)c010AssignmentName.eContents().get(0);
+		private final Assignment c011AssignmentType = (Assignment)c01Group.eContents().get(1);
+		private final RuleCall c0110LexerRuleCallID = (RuleCall)c011AssignmentType.eContents().get(0);
+		private final Assignment c1AssignmentType = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentType.eContents().get(0);
 		
 		// TrickyD : 'TD' ( name += INT foo = STRING type += ID ) ? ( name += INT type += ID ) ? ( type += ID ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(9)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'TD' ( name += INT foo = STRING type += ID ) ? ( name += INT type += ID ) ? ( type += ID ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'TD' ( name += INT foo = STRING type += ID ) ? ( name += INT type += ID ) ?
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'TD' ( name += INT foo = STRING type += ID ) ?
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'TD'
-		public Keyword ele000KeywordTD() {
-			return (c000KeywordTD != null) ? c000KeywordTD : (c000KeywordTD = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordTD() { return c000KeywordTD; }
 
 		// ( name += INT foo = STRING type += ID ) ?
-		public Group ele001Group() {
-			return (c001Group != null) ? c001Group : (c001Group = (Group)ele00Group().eContents().get(1)); 
-		}
+		public Group ele001Group() { return c001Group; }
 
 		// name += INT foo = STRING
-		public Group ele0010Group() {
-			return (c0010Group != null) ? c0010Group : (c0010Group = (Group)ele001Group().eContents().get(0)); 
-		}
+		public Group ele0010Group() { return c0010Group; }
 
 		// name += INT
-		public Assignment ele00100AssignmentName() {
-			return (c00100AssignmentName != null) ? c00100AssignmentName : (c00100AssignmentName = (Assignment)ele0010Group().eContents().get(0)); 
-		}
+		public Assignment ele00100AssignmentName() { return c00100AssignmentName; }
 
 		// INT
-		public RuleCall ele001000LexerRuleCallINT() {
-			return (c001000LexerRuleCallINT != null) ? c001000LexerRuleCallINT : (c001000LexerRuleCallINT = (RuleCall)ele00100AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele001000LexerRuleCallINT() { return c001000LexerRuleCallINT; }
 
 		// foo = STRING
-		public Assignment ele00101AssignmentFoo() {
-			return (c00101AssignmentFoo != null) ? c00101AssignmentFoo : (c00101AssignmentFoo = (Assignment)ele0010Group().eContents().get(1)); 
-		}
+		public Assignment ele00101AssignmentFoo() { return c00101AssignmentFoo; }
 
 		// STRING
-		public RuleCall ele001010LexerRuleCallSTRING() {
-			return (c001010LexerRuleCallSTRING != null) ? c001010LexerRuleCallSTRING : (c001010LexerRuleCallSTRING = (RuleCall)ele00101AssignmentFoo().eContents().get(0)); 
-		}
+		public RuleCall ele001010LexerRuleCallSTRING() { return c001010LexerRuleCallSTRING; }
 
 		// type += ID
-		public Assignment ele0011AssignmentType() {
-			return (c0011AssignmentType != null) ? c0011AssignmentType : (c0011AssignmentType = (Assignment)ele001Group().eContents().get(1)); 
-		}
+		public Assignment ele0011AssignmentType() { return c0011AssignmentType; }
 
 		// ID
-		public RuleCall ele00110LexerRuleCallID() {
-			return (c00110LexerRuleCallID != null) ? c00110LexerRuleCallID : (c00110LexerRuleCallID = (RuleCall)ele0011AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele00110LexerRuleCallID() { return c00110LexerRuleCallID; }
 
 		// ( name += INT type += ID ) ?
-		public Group ele01Group() {
-			return (c01Group != null) ? c01Group : (c01Group = (Group)ele0Group().eContents().get(1)); 
-		}
+		public Group ele01Group() { return c01Group; }
 
 		// name += INT
-		public Assignment ele010AssignmentName() {
-			return (c010AssignmentName != null) ? c010AssignmentName : (c010AssignmentName = (Assignment)ele01Group().eContents().get(0)); 
-		}
+		public Assignment ele010AssignmentName() { return c010AssignmentName; }
 
 		// INT
-		public RuleCall ele0100LexerRuleCallINT() {
-			return (c0100LexerRuleCallINT != null) ? c0100LexerRuleCallINT : (c0100LexerRuleCallINT = (RuleCall)ele010AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0100LexerRuleCallINT() { return c0100LexerRuleCallINT; }
 
 		// type += ID
-		public Assignment ele011AssignmentType() {
-			return (c011AssignmentType != null) ? c011AssignmentType : (c011AssignmentType = (Assignment)ele01Group().eContents().get(1)); 
-		}
+		public Assignment ele011AssignmentType() { return c011AssignmentType; }
 
 		// ID
-		public RuleCall ele0110LexerRuleCallID() {
-			return (c0110LexerRuleCallID != null) ? c0110LexerRuleCallID : (c0110LexerRuleCallID = (RuleCall)ele011AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele0110LexerRuleCallID() { return c0110LexerRuleCallID; }
 
 		// ( type += ID ) *
-		public Assignment ele1AssignmentType() {
-			return (c1AssignmentType != null) ? c1AssignmentType : (c1AssignmentType = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentType() { return c1AssignmentType; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 
 	public class TrickyEElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordTE;
-		private Group c001Group;
-		private Group c0010Group;
-		private Assignment c00100AssignmentName;
-		private RuleCall c001000LexerRuleCallINT;
-		private Assignment c00101AssignmentFoo;
-		private RuleCall c001010LexerRuleCallSTRING;
-		private Assignment c0011AssignmentType;
-		private RuleCall c00110LexerRuleCallID;
-		private Keyword c01KeywordX;
-		private Group c1Group;
-		private Assignment c10AssignmentName;
-		private RuleCall c100LexerRuleCallINT;
-		private Assignment c11AssignmentType;
-		private RuleCall c110LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(10);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordTE = (Keyword)c00Group.eContents().get(0);
+		private final Group c001Group = (Group)c00Group.eContents().get(1);
+		private final Group c0010Group = (Group)c001Group.eContents().get(0);
+		private final Assignment c00100AssignmentName = (Assignment)c0010Group.eContents().get(0);
+		private final RuleCall c001000LexerRuleCallINT = (RuleCall)c00100AssignmentName.eContents().get(0);
+		private final Assignment c00101AssignmentFoo = (Assignment)c0010Group.eContents().get(1);
+		private final RuleCall c001010LexerRuleCallSTRING = (RuleCall)c00101AssignmentFoo.eContents().get(0);
+		private final Assignment c0011AssignmentType = (Assignment)c001Group.eContents().get(1);
+		private final RuleCall c00110LexerRuleCallID = (RuleCall)c0011AssignmentType.eContents().get(0);
+		private final Keyword c01KeywordX = (Keyword)c0Group.eContents().get(1);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Assignment c10AssignmentName = (Assignment)c1Group.eContents().get(0);
+		private final RuleCall c100LexerRuleCallINT = (RuleCall)c10AssignmentName.eContents().get(0);
+		private final Assignment c11AssignmentType = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110LexerRuleCallID = (RuleCall)c11AssignmentType.eContents().get(0);
 		
 		// TrickyE : 'TE' ( name += INT foo += STRING type += ID ) * 'x' ( name += INT type += ID ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(10)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'TE' ( name += INT foo += STRING type += ID ) * 'x' ( name += INT type += ID ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'TE' ( name += INT foo += STRING type += ID ) * 'x'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'TE' ( name += INT foo += STRING type += ID ) *
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'TE'
-		public Keyword ele000KeywordTE() {
-			return (c000KeywordTE != null) ? c000KeywordTE : (c000KeywordTE = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordTE() { return c000KeywordTE; }
 
 		// ( name += INT foo += STRING type += ID ) *
-		public Group ele001Group() {
-			return (c001Group != null) ? c001Group : (c001Group = (Group)ele00Group().eContents().get(1)); 
-		}
+		public Group ele001Group() { return c001Group; }
 
 		// name += INT foo += STRING
-		public Group ele0010Group() {
-			return (c0010Group != null) ? c0010Group : (c0010Group = (Group)ele001Group().eContents().get(0)); 
-		}
+		public Group ele0010Group() { return c0010Group; }
 
 		// name += INT
-		public Assignment ele00100AssignmentName() {
-			return (c00100AssignmentName != null) ? c00100AssignmentName : (c00100AssignmentName = (Assignment)ele0010Group().eContents().get(0)); 
-		}
+		public Assignment ele00100AssignmentName() { return c00100AssignmentName; }
 
 		// INT
-		public RuleCall ele001000LexerRuleCallINT() {
-			return (c001000LexerRuleCallINT != null) ? c001000LexerRuleCallINT : (c001000LexerRuleCallINT = (RuleCall)ele00100AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele001000LexerRuleCallINT() { return c001000LexerRuleCallINT; }
 
 		// foo += STRING
-		public Assignment ele00101AssignmentFoo() {
-			return (c00101AssignmentFoo != null) ? c00101AssignmentFoo : (c00101AssignmentFoo = (Assignment)ele0010Group().eContents().get(1)); 
-		}
+		public Assignment ele00101AssignmentFoo() { return c00101AssignmentFoo; }
 
 		// STRING
-		public RuleCall ele001010LexerRuleCallSTRING() {
-			return (c001010LexerRuleCallSTRING != null) ? c001010LexerRuleCallSTRING : (c001010LexerRuleCallSTRING = (RuleCall)ele00101AssignmentFoo().eContents().get(0)); 
-		}
+		public RuleCall ele001010LexerRuleCallSTRING() { return c001010LexerRuleCallSTRING; }
 
 		// type += ID
-		public Assignment ele0011AssignmentType() {
-			return (c0011AssignmentType != null) ? c0011AssignmentType : (c0011AssignmentType = (Assignment)ele001Group().eContents().get(1)); 
-		}
+		public Assignment ele0011AssignmentType() { return c0011AssignmentType; }
 
 		// ID
-		public RuleCall ele00110LexerRuleCallID() {
-			return (c00110LexerRuleCallID != null) ? c00110LexerRuleCallID : (c00110LexerRuleCallID = (RuleCall)ele0011AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele00110LexerRuleCallID() { return c00110LexerRuleCallID; }
 
 		// 'x'
-		public Keyword ele01KeywordX() {
-			return (c01KeywordX != null) ? c01KeywordX : (c01KeywordX = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordX() { return c01KeywordX; }
 
 		// ( name += INT type += ID ) *
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// name += INT
-		public Assignment ele10AssignmentName() {
-			return (c10AssignmentName != null) ? c10AssignmentName : (c10AssignmentName = (Assignment)ele1Group().eContents().get(0)); 
-		}
+		public Assignment ele10AssignmentName() { return c10AssignmentName; }
 
 		// INT
-		public RuleCall ele100LexerRuleCallINT() {
-			return (c100LexerRuleCallINT != null) ? c100LexerRuleCallINT : (c100LexerRuleCallINT = (RuleCall)ele10AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele100LexerRuleCallINT() { return c100LexerRuleCallINT; }
 
 		// type += ID
-		public Assignment ele11AssignmentType() {
-			return (c11AssignmentType != null) ? c11AssignmentType : (c11AssignmentType = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentType() { return c11AssignmentType; }
 
 		// ID
-		public RuleCall ele110LexerRuleCallID() {
-			return (c110LexerRuleCallID != null) ? c110LexerRuleCallID : (c110LexerRuleCallID = (RuleCall)ele11AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele110LexerRuleCallID() { return c110LexerRuleCallID; }
 	}
 
 	public class TrickyFElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Keyword c00KeywordTF;
-		private Group c01Group;
-		private Assignment c010AssignmentName;
-		private RuleCall c0100LexerRuleCallID;
-		private Assignment c011AssignmentType;
-		private RuleCall c0110LexerRuleCallINT;
-		private Alternatives c1Alternatives;
-		private Assignment c10AssignmentName;
-		private RuleCall c100LexerRuleCallID;
-		private Assignment c11AssignmentType;
-		private RuleCall c110LexerRuleCallINT;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(11);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Keyword c00KeywordTF = (Keyword)c0Group.eContents().get(0);
+		private final Group c01Group = (Group)c0Group.eContents().get(1);
+		private final Assignment c010AssignmentName = (Assignment)c01Group.eContents().get(0);
+		private final RuleCall c0100LexerRuleCallID = (RuleCall)c010AssignmentName.eContents().get(0);
+		private final Assignment c011AssignmentType = (Assignment)c01Group.eContents().get(1);
+		private final RuleCall c0110LexerRuleCallINT = (RuleCall)c011AssignmentType.eContents().get(0);
+		private final Alternatives c1Alternatives = (Alternatives)cGroup.eContents().get(1);
+		private final Assignment c10AssignmentName = (Assignment)c1Alternatives.eContents().get(0);
+		private final RuleCall c100LexerRuleCallID = (RuleCall)c10AssignmentName.eContents().get(0);
+		private final Assignment c11AssignmentType = (Assignment)c1Alternatives.eContents().get(1);
+		private final RuleCall c110LexerRuleCallINT = (RuleCall)c11AssignmentType.eContents().get(0);
 		
 		// TrickyF : 'TF' ( name += ID type += INT ) * ( name += ID | type += INT ) ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(11)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'TF' ( name += ID type += INT ) * ( name += ID | type += INT )
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'TF' ( name += ID type += INT ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'TF'
-		public Keyword ele00KeywordTF() {
-			return (c00KeywordTF != null) ? c00KeywordTF : (c00KeywordTF = (Keyword)ele0Group().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordTF() { return c00KeywordTF; }
 
 		// ( name += ID type += INT ) *
-		public Group ele01Group() {
-			return (c01Group != null) ? c01Group : (c01Group = (Group)ele0Group().eContents().get(1)); 
-		}
+		public Group ele01Group() { return c01Group; }
 
 		// name += ID
-		public Assignment ele010AssignmentName() {
-			return (c010AssignmentName != null) ? c010AssignmentName : (c010AssignmentName = (Assignment)ele01Group().eContents().get(0)); 
-		}
+		public Assignment ele010AssignmentName() { return c010AssignmentName; }
 
 		// ID
-		public RuleCall ele0100LexerRuleCallID() {
-			return (c0100LexerRuleCallID != null) ? c0100LexerRuleCallID : (c0100LexerRuleCallID = (RuleCall)ele010AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0100LexerRuleCallID() { return c0100LexerRuleCallID; }
 
 		// type += INT
-		public Assignment ele011AssignmentType() {
-			return (c011AssignmentType != null) ? c011AssignmentType : (c011AssignmentType = (Assignment)ele01Group().eContents().get(1)); 
-		}
+		public Assignment ele011AssignmentType() { return c011AssignmentType; }
 
 		// INT
-		public RuleCall ele0110LexerRuleCallINT() {
-			return (c0110LexerRuleCallINT != null) ? c0110LexerRuleCallINT : (c0110LexerRuleCallINT = (RuleCall)ele011AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele0110LexerRuleCallINT() { return c0110LexerRuleCallINT; }
 
 		// name += ID | type += INT
-		public Alternatives ele1Alternatives() {
-			return (c1Alternatives != null) ? c1Alternatives : (c1Alternatives = (Alternatives)eleGroup().eContents().get(1)); 
-		}
+		public Alternatives ele1Alternatives() { return c1Alternatives; }
 
 		// name += ID
-		public Assignment ele10AssignmentName() {
-			return (c10AssignmentName != null) ? c10AssignmentName : (c10AssignmentName = (Assignment)ele1Alternatives().eContents().get(0)); 
-		}
+		public Assignment ele10AssignmentName() { return c10AssignmentName; }
 
 		// ID
-		public RuleCall ele100LexerRuleCallID() {
-			return (c100LexerRuleCallID != null) ? c100LexerRuleCallID : (c100LexerRuleCallID = (RuleCall)ele10AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele100LexerRuleCallID() { return c100LexerRuleCallID; }
 
 		// type += INT
-		public Assignment ele11AssignmentType() {
-			return (c11AssignmentType != null) ? c11AssignmentType : (c11AssignmentType = (Assignment)ele1Alternatives().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentType() { return c11AssignmentType; }
 
 		// INT
-		public RuleCall ele110LexerRuleCallINT() {
-			return (c110LexerRuleCallINT != null) ? c110LexerRuleCallINT : (c110LexerRuleCallINT = (RuleCall)ele11AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele110LexerRuleCallINT() { return c110LexerRuleCallINT; }
 	}
 	
 	public final static ComplexReconstrTestLanguageGrammarAccess INSTANCE = new ComplexReconstrTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java
index 50ed4a9..bea24e6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/SimpleReconstrTestLanguageGrammarAccess.java
@@ -11,516 +11,354 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class SimpleReconstrTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class OpElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private RuleCall c0ParserRuleCallTerm;
-		private Group c1Group;
-		private Action c10ActionOpvalues;
-		private Assignment c11AssignmentValues;
-		private RuleCall c110ParserRuleCallTerm;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallTerm = (RuleCall)cGroup.eContents().get(0);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Action c10ActionOpvalues = (Action)c1Group.eContents().get(0);
+		private final Assignment c11AssignmentValues = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110ParserRuleCallTerm = (RuleCall)c11AssignmentValues.eContents().get(0);
 		
 		// Op returns Expression : Term ( { current = Op . values += current } values += Term ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// Term ( { current = Op . values += current } values += Term ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// Term
-		public RuleCall ele0ParserRuleCallTerm() {
-			return (c0ParserRuleCallTerm != null) ? c0ParserRuleCallTerm : (c0ParserRuleCallTerm = (RuleCall)eleGroup().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallTerm() { return c0ParserRuleCallTerm; }
 
 		// ( { current = Op . values += current } values += Term ) *
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// { current = Op . values += current }
-		public Action ele10ActionOpvalues() {
-			return (c10ActionOpvalues != null) ? c10ActionOpvalues : (c10ActionOpvalues = (Action)ele1Group().eContents().get(0)); 
-		}
+		public Action ele10ActionOpvalues() { return c10ActionOpvalues; }
 
 		// values += Term
-		public Assignment ele11AssignmentValues() {
-			return (c11AssignmentValues != null) ? c11AssignmentValues : (c11AssignmentValues = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentValues() { return c11AssignmentValues; }
 
 		// Term
-		public RuleCall ele110ParserRuleCallTerm() {
-			return (c110ParserRuleCallTerm != null) ? c110ParserRuleCallTerm : (c110ParserRuleCallTerm = (RuleCall)ele11AssignmentValues().eContents().get(0)); 
-		}
+		public RuleCall ele110ParserRuleCallTerm() { return c110ParserRuleCallTerm; }
 	}
 
 	public class TermElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private Alternatives c0Alternatives;
-		private Alternatives c00Alternatives;
-		private Alternatives c000Alternatives;
-		private Alternatives c0000Alternatives;
-		private Alternatives c00000Alternatives;
-		private RuleCall c000000ParserRuleCallAtom;
-		private RuleCall c000001ParserRuleCallTwoNumbers;
-		private RuleCall c00001ParserRuleCallManyStrings;
-		private RuleCall c0001ParserRuleCallParens;
-		private RuleCall c001ParserRuleCallType;
-		private RuleCall c01ParserRuleCallRef2;
-		private RuleCall c1ParserRuleCallSpare;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final Alternatives c0Alternatives = (Alternatives)cAlternatives.eContents().get(0);
+		private final Alternatives c00Alternatives = (Alternatives)c0Alternatives.eContents().get(0);
+		private final Alternatives c000Alternatives = (Alternatives)c00Alternatives.eContents().get(0);
+		private final Alternatives c0000Alternatives = (Alternatives)c000Alternatives.eContents().get(0);
+		private final Alternatives c00000Alternatives = (Alternatives)c0000Alternatives.eContents().get(0);
+		private final RuleCall c000000ParserRuleCallAtom = (RuleCall)c00000Alternatives.eContents().get(0);
+		private final RuleCall c000001ParserRuleCallTwoNumbers = (RuleCall)c00000Alternatives.eContents().get(1);
+		private final RuleCall c00001ParserRuleCallManyStrings = (RuleCall)c0000Alternatives.eContents().get(1);
+		private final RuleCall c0001ParserRuleCallParens = (RuleCall)c000Alternatives.eContents().get(1);
+		private final RuleCall c001ParserRuleCallType = (RuleCall)c00Alternatives.eContents().get(1);
+		private final RuleCall c01ParserRuleCallRef2 = (RuleCall)c0Alternatives.eContents().get(1);
+		private final RuleCall c1ParserRuleCallSpare = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// Term returns Expression : Atom | TwoNumbers | ManyStrings | Parens | Type | Ref2 | Spare ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// Atom | TwoNumbers | ManyStrings | Parens | Type | Ref2 | Spare
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// Atom | TwoNumbers | ManyStrings | Parens | Type | Ref2
-		public Alternatives ele0Alternatives() {
-			return (c0Alternatives != null) ? c0Alternatives : (c0Alternatives = (Alternatives)eleAlternatives().eContents().get(0)); 
-		}
+		public Alternatives ele0Alternatives() { return c0Alternatives; }
 
 		// Atom | TwoNumbers | ManyStrings | Parens | Type
-		public Alternatives ele00Alternatives() {
-			return (c00Alternatives != null) ? c00Alternatives : (c00Alternatives = (Alternatives)ele0Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele00Alternatives() { return c00Alternatives; }
 
 		// Atom | TwoNumbers | ManyStrings | Parens
-		public Alternatives ele000Alternatives() {
-			return (c000Alternatives != null) ? c000Alternatives : (c000Alternatives = (Alternatives)ele00Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele000Alternatives() { return c000Alternatives; }
 
 		// Atom | TwoNumbers | ManyStrings
-		public Alternatives ele0000Alternatives() {
-			return (c0000Alternatives != null) ? c0000Alternatives : (c0000Alternatives = (Alternatives)ele000Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele0000Alternatives() { return c0000Alternatives; }
 
 		// Atom | TwoNumbers
-		public Alternatives ele00000Alternatives() {
-			return (c00000Alternatives != null) ? c00000Alternatives : (c00000Alternatives = (Alternatives)ele0000Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele00000Alternatives() { return c00000Alternatives; }
 
 		// Atom
-		public RuleCall ele000000ParserRuleCallAtom() {
-			return (c000000ParserRuleCallAtom != null) ? c000000ParserRuleCallAtom : (c000000ParserRuleCallAtom = (RuleCall)ele00000Alternatives().eContents().get(0)); 
-		}
+		public RuleCall ele000000ParserRuleCallAtom() { return c000000ParserRuleCallAtom; }
 
 		// TwoNumbers
-		public RuleCall ele000001ParserRuleCallTwoNumbers() {
-			return (c000001ParserRuleCallTwoNumbers != null) ? c000001ParserRuleCallTwoNumbers : (c000001ParserRuleCallTwoNumbers = (RuleCall)ele00000Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele000001ParserRuleCallTwoNumbers() { return c000001ParserRuleCallTwoNumbers; }
 
 		// ManyStrings
-		public RuleCall ele00001ParserRuleCallManyStrings() {
-			return (c00001ParserRuleCallManyStrings != null) ? c00001ParserRuleCallManyStrings : (c00001ParserRuleCallManyStrings = (RuleCall)ele0000Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele00001ParserRuleCallManyStrings() { return c00001ParserRuleCallManyStrings; }
 
 		// Parens
-		public RuleCall ele0001ParserRuleCallParens() {
-			return (c0001ParserRuleCallParens != null) ? c0001ParserRuleCallParens : (c0001ParserRuleCallParens = (RuleCall)ele000Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele0001ParserRuleCallParens() { return c0001ParserRuleCallParens; }
 
 		// Type
-		public RuleCall ele001ParserRuleCallType() {
-			return (c001ParserRuleCallType != null) ? c001ParserRuleCallType : (c001ParserRuleCallType = (RuleCall)ele00Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele001ParserRuleCallType() { return c001ParserRuleCallType; }
 
 		// Ref2
-		public RuleCall ele01ParserRuleCallRef2() {
-			return (c01ParserRuleCallRef2 != null) ? c01ParserRuleCallRef2 : (c01ParserRuleCallRef2 = (RuleCall)ele0Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele01ParserRuleCallRef2() { return c01ParserRuleCallRef2; }
 
 		// Spare
-		public RuleCall ele1ParserRuleCallSpare() {
-			return (c1ParserRuleCallSpare != null) ? c1ParserRuleCallSpare : (c1ParserRuleCallSpare = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallSpare() { return c1ParserRuleCallSpare; }
 	}
 
 	public class AtomElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentName;
-		private RuleCall c0LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Assignment cAssignmentName = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0LexerRuleCallID = (RuleCall)cAssignmentName.eContents().get(0);
 		
 		// Atom : name = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID
-		public Assignment eleAssignmentName() {
-			return (cAssignmentName != null) ? cAssignmentName : (cAssignmentName = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentName() { return cAssignmentName; }
 
 		// ID
-		public RuleCall ele0LexerRuleCallID() {
-			return (c0LexerRuleCallID != null) ? c0LexerRuleCallID : (c0LexerRuleCallID = (RuleCall)eleAssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0LexerRuleCallID() { return c0LexerRuleCallID; }
 	}
 
 	public class ParensElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000Keyword;
-		private RuleCall c001ParserRuleCallOp;
-		private Keyword c01Keyword;
-		private Assignment c1AssignmentEm;
-		private Keyword c10Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordLeftParenthesis = (Keyword)c00Group.eContents().get(0);
+		private final RuleCall c001ParserRuleCallOp = (RuleCall)c00Group.eContents().get(1);
+		private final Keyword c01KeywordRightParenthesis = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentEm = (Assignment)cGroup.eContents().get(1);
+		private final Keyword c10KeywordExclamationMark = (Keyword)c1AssignmentEm.eContents().get(0);
 		
 		// Parens returns Expression : '(' Op ')' ( em = '!' ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '(' Op ')' ( em = '!' ) ?
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '(' Op ')'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '(' Op
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// '('
-		public Keyword ele000Keyword() {
-			return (c000Keyword != null) ? c000Keyword : (c000Keyword = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordLeftParenthesis() { return c000KeywordLeftParenthesis; }
 
 		// Op
-		public RuleCall ele001ParserRuleCallOp() {
-			return (c001ParserRuleCallOp != null) ? c001ParserRuleCallOp : (c001ParserRuleCallOp = (RuleCall)ele00Group().eContents().get(1)); 
-		}
+		public RuleCall ele001ParserRuleCallOp() { return c001ParserRuleCallOp; }
 
 		// ')'
-		public Keyword ele01Keyword() {
-			return (c01Keyword != null) ? c01Keyword : (c01Keyword = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordRightParenthesis() { return c01KeywordRightParenthesis; }
 
 		// ( em = '!' ) ?
-		public Assignment ele1AssignmentEm() {
-			return (c1AssignmentEm != null) ? c1AssignmentEm : (c1AssignmentEm = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentEm() { return c1AssignmentEm; }
 
 		// '!'
-		public Keyword ele10Keyword() {
-			return (c10Keyword != null) ? c10Keyword : (c10Keyword = (Keyword)ele1AssignmentEm().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordExclamationMark() { return c10KeywordExclamationMark; }
 	}
 
 	public class TwoNumbersElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Assignment c00AssignmentNum1;
-		private RuleCall c000LexerRuleCallINT;
-		private Assignment c01AssignmentNum2;
-		private RuleCall c010LexerRuleCallINT;
-		private Group c1Group;
-		private Keyword c10Keyword;
-		private Assignment c11AssignmentNum3;
-		private RuleCall c110LexerRuleCallINT;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(5);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Assignment c00AssignmentNum1 = (Assignment)c0Group.eContents().get(0);
+		private final RuleCall c000LexerRuleCallINT = (RuleCall)c00AssignmentNum1.eContents().get(0);
+		private final Assignment c01AssignmentNum2 = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallINT = (RuleCall)c01AssignmentNum2.eContents().get(0);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Keyword c10KeywordNumberSign = (Keyword)c1Group.eContents().get(0);
+		private final Assignment c11AssignmentNum3 = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110LexerRuleCallINT = (RuleCall)c11AssignmentNum3.eContents().get(0);
 		
 		// TwoNumbers : num1 = INT num2 = INT ( '#' num3 += INT ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(5)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// num1 = INT num2 = INT ( '#' num3 += INT ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// num1 = INT num2 = INT
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// num1 = INT
-		public Assignment ele00AssignmentNum1() {
-			return (c00AssignmentNum1 != null) ? c00AssignmentNum1 : (c00AssignmentNum1 = (Assignment)ele0Group().eContents().get(0)); 
-		}
+		public Assignment ele00AssignmentNum1() { return c00AssignmentNum1; }
 
 		// INT
-		public RuleCall ele000LexerRuleCallINT() {
-			return (c000LexerRuleCallINT != null) ? c000LexerRuleCallINT : (c000LexerRuleCallINT = (RuleCall)ele00AssignmentNum1().eContents().get(0)); 
-		}
+		public RuleCall ele000LexerRuleCallINT() { return c000LexerRuleCallINT; }
 
 		// num2 = INT
-		public Assignment ele01AssignmentNum2() {
-			return (c01AssignmentNum2 != null) ? c01AssignmentNum2 : (c01AssignmentNum2 = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentNum2() { return c01AssignmentNum2; }
 
 		// INT
-		public RuleCall ele010LexerRuleCallINT() {
-			return (c010LexerRuleCallINT != null) ? c010LexerRuleCallINT : (c010LexerRuleCallINT = (RuleCall)ele01AssignmentNum2().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallINT() { return c010LexerRuleCallINT; }
 
 		// ( '#' num3 += INT ) *
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// '#'
-		public Keyword ele10Keyword() {
-			return (c10Keyword != null) ? c10Keyword : (c10Keyword = (Keyword)ele1Group().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordNumberSign() { return c10KeywordNumberSign; }
 
 		// num3 += INT
-		public Assignment ele11AssignmentNum3() {
-			return (c11AssignmentNum3 != null) ? c11AssignmentNum3 : (c11AssignmentNum3 = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentNum3() { return c11AssignmentNum3; }
 
 		// INT
-		public RuleCall ele110LexerRuleCallINT() {
-			return (c110LexerRuleCallINT != null) ? c110LexerRuleCallINT : (c110LexerRuleCallINT = (RuleCall)ele11AssignmentNum3().eContents().get(0)); 
-		}
+		public RuleCall ele110LexerRuleCallINT() { return c110LexerRuleCallINT; }
 	}
 
 	public class ManyStringsElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Keyword c00Keyword;
-		private Assignment c01AssignmentStr1;
-		private RuleCall c010LexerRuleCallSTRING;
-		private Assignment c1AssignmentStr2;
-		private RuleCall c10LexerRuleCallSTRING;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(6);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Keyword c00KeywordEqualsSign = (Keyword)c0Group.eContents().get(0);
+		private final Assignment c01AssignmentStr1 = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallSTRING = (RuleCall)c01AssignmentStr1.eContents().get(0);
+		private final Assignment c1AssignmentStr2 = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallSTRING = (RuleCall)c1AssignmentStr2.eContents().get(0);
 		
 		// ManyStrings : '=' ( str1 += STRING ) * str2 += STRING ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(6)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '=' ( str1 += STRING ) * str2 += STRING
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '=' ( str1 += STRING ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '='
-		public Keyword ele00Keyword() {
-			return (c00Keyword != null) ? c00Keyword : (c00Keyword = (Keyword)ele0Group().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordEqualsSign() { return c00KeywordEqualsSign; }
 
 		// ( str1 += STRING ) *
-		public Assignment ele01AssignmentStr1() {
-			return (c01AssignmentStr1 != null) ? c01AssignmentStr1 : (c01AssignmentStr1 = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentStr1() { return c01AssignmentStr1; }
 
 		// STRING
-		public RuleCall ele010LexerRuleCallSTRING() {
-			return (c010LexerRuleCallSTRING != null) ? c010LexerRuleCallSTRING : (c010LexerRuleCallSTRING = (RuleCall)ele01AssignmentStr1().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallSTRING() { return c010LexerRuleCallSTRING; }
 
 		// str2 += STRING
-		public Assignment ele1AssignmentStr2() {
-			return (c1AssignmentStr2 != null) ? c1AssignmentStr2 : (c1AssignmentStr2 = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentStr2() { return c1AssignmentStr2; }
 
 		// STRING
-		public RuleCall ele10LexerRuleCallSTRING() {
-			return (c10LexerRuleCallSTRING != null) ? c10LexerRuleCallSTRING : (c10LexerRuleCallSTRING = (RuleCall)ele1AssignmentStr2().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallSTRING() { return c10LexerRuleCallSTRING; }
 	}
 
 	public class TypeElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordType;
-		private Assignment c001AssignmentName;
-		private RuleCall c0010LexerRuleCallID;
-		private Keyword c01KeywordExtends;
-		private Assignment c1AssignmentExtends;
-		private CrossReference c10CrossReferenceType;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(7);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordType = (Keyword)c00Group.eContents().get(0);
+		private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+		private final Keyword c01KeywordExtends = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentExtends = (Assignment)cGroup.eContents().get(1);
+		private final CrossReference c10CrossReferenceType = (CrossReference)c1AssignmentExtends.eContents().get(0);
 		
 		// Type : 'type' name = ID 'extends' ^extends = [ Type ] ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(7)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'type' name = ID 'extends' ^extends = [ Type ]
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'type' name = ID 'extends'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'type' name = ID
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'type'
-		public Keyword ele000KeywordType() {
-			return (c000KeywordType != null) ? c000KeywordType : (c000KeywordType = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordType() { return c000KeywordType; }
 
 		// name = ID
-		public Assignment ele001AssignmentName() {
-			return (c001AssignmentName != null) ? c001AssignmentName : (c001AssignmentName = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentName() { return c001AssignmentName; }
 
 		// ID
-		public RuleCall ele0010LexerRuleCallID() {
-			return (c0010LexerRuleCallID != null) ? c0010LexerRuleCallID : (c0010LexerRuleCallID = (RuleCall)ele001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
 
 		// 'extends'
-		public Keyword ele01KeywordExtends() {
-			return (c01KeywordExtends != null) ? c01KeywordExtends : (c01KeywordExtends = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordExtends() { return c01KeywordExtends; }
 
 		// ^extends = [ Type ]
-		public Assignment ele1AssignmentExtends() {
-			return (c1AssignmentExtends != null) ? c1AssignmentExtends : (c1AssignmentExtends = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentExtends() { return c1AssignmentExtends; }
 
 		// [ Type ]
-		public CrossReference ele10CrossReferenceType() {
-			return (c10CrossReferenceType != null) ? c10CrossReferenceType : (c10CrossReferenceType = (CrossReference)ele1AssignmentExtends().eContents().get(0)); 
-		}
+		public CrossReference ele10CrossReferenceType() { return c10CrossReferenceType; }
 	}
 
 	public class Ref2Elements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Keyword c0Keyword;
-		private Assignment c1AssignmentRef2;
-		private Alternatives c10Alternatives;
-		private Alternatives c100Alternatives;
-		private Keyword c1000KeywordMykeyword1;
-		private RuleCall c1001LexerRuleCallSTRING;
-		private Keyword c101KeywordMykeyword2;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(8);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordNumberSignDigitTwo = (Keyword)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentRef2 = (Assignment)cGroup.eContents().get(1);
+		private final Alternatives c10Alternatives = (Alternatives)c1AssignmentRef2.eContents().get(0);
+		private final Alternatives c100Alternatives = (Alternatives)c10Alternatives.eContents().get(0);
+		private final Keyword c1000KeywordMykeyword1 = (Keyword)c100Alternatives.eContents().get(0);
+		private final RuleCall c1001LexerRuleCallSTRING = (RuleCall)c100Alternatives.eContents().get(1);
+		private final Keyword c101KeywordMykeyword2 = (Keyword)c10Alternatives.eContents().get(1);
 		
 		// Ref2 : '#2' ref2 = ( 'mykeyword1' | STRING | 'mykeyword2' ) ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(8)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '#2' ref2 = ( 'mykeyword1' | STRING | 'mykeyword2' )
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '#2'
-		public Keyword ele0Keyword() {
-			return (c0Keyword != null) ? c0Keyword : (c0Keyword = (Keyword)eleGroup().eContents().get(0)); 
-		}
+		public Keyword ele0KeywordNumberSignDigitTwo() { return c0KeywordNumberSignDigitTwo; }
 
 		// ref2 = ( 'mykeyword1' | STRING | 'mykeyword2' )
-		public Assignment ele1AssignmentRef2() {
-			return (c1AssignmentRef2 != null) ? c1AssignmentRef2 : (c1AssignmentRef2 = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentRef2() { return c1AssignmentRef2; }
 
 		// 'mykeyword1' | STRING | 'mykeyword2'
-		public Alternatives ele10Alternatives() {
-			return (c10Alternatives != null) ? c10Alternatives : (c10Alternatives = (Alternatives)ele1AssignmentRef2().eContents().get(0)); 
-		}
+		public Alternatives ele10Alternatives() { return c10Alternatives; }
 
 		// 'mykeyword1' | STRING
-		public Alternatives ele100Alternatives() {
-			return (c100Alternatives != null) ? c100Alternatives : (c100Alternatives = (Alternatives)ele10Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele100Alternatives() { return c100Alternatives; }
 
 		// 'mykeyword1'
-		public Keyword ele1000KeywordMykeyword1() {
-			return (c1000KeywordMykeyword1 != null) ? c1000KeywordMykeyword1 : (c1000KeywordMykeyword1 = (Keyword)ele100Alternatives().eContents().get(0)); 
-		}
+		public Keyword ele1000KeywordMykeyword1() { return c1000KeywordMykeyword1; }
 
 		// STRING
-		public RuleCall ele1001LexerRuleCallSTRING() {
-			return (c1001LexerRuleCallSTRING != null) ? c1001LexerRuleCallSTRING : (c1001LexerRuleCallSTRING = (RuleCall)ele100Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1001LexerRuleCallSTRING() { return c1001LexerRuleCallSTRING; }
 
 		// 'mykeyword2'
-		public Keyword ele101KeywordMykeyword2() {
-			return (c101KeywordMykeyword2 != null) ? c101KeywordMykeyword2 : (c101KeywordMykeyword2 = (Keyword)ele10Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele101KeywordMykeyword2() { return c101KeywordMykeyword2; }
 	}
 
 	public class SpareElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Keyword c00Keyword;
-		private Assignment c01AssignmentId;
-		private RuleCall c010LexerRuleCallID;
-		private Group c1Group;
-		private Keyword c10Keyword;
-		private Assignment c11AssignmentId;
-		private RuleCall c110LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(9);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Keyword c00KeywordNumberSignDigitThree = (Keyword)c0Group.eContents().get(0);
+		private final Assignment c01AssignmentId = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallID = (RuleCall)c01AssignmentId.eContents().get(0);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Keyword c10KeywordFullStop = (Keyword)c1Group.eContents().get(0);
+		private final Assignment c11AssignmentId = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110LexerRuleCallID = (RuleCall)c11AssignmentId.eContents().get(0);
 		
 		// Spare : '#3' id += ID ( '.' id += ID ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(9)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '#3' id += ID ( '.' id += ID ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '#3' id += ID
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '#3'
-		public Keyword ele00Keyword() {
-			return (c00Keyword != null) ? c00Keyword : (c00Keyword = (Keyword)ele0Group().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordNumberSignDigitThree() { return c00KeywordNumberSignDigitThree; }
 
 		// id += ID
-		public Assignment ele01AssignmentId() {
-			return (c01AssignmentId != null) ? c01AssignmentId : (c01AssignmentId = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentId() { return c01AssignmentId; }
 
 		// ID
-		public RuleCall ele010LexerRuleCallID() {
-			return (c010LexerRuleCallID != null) ? c010LexerRuleCallID : (c010LexerRuleCallID = (RuleCall)ele01AssignmentId().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallID() { return c010LexerRuleCallID; }
 
 		// ( '.' id += ID ) *
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// '.'
-		public Keyword ele10Keyword() {
-			return (c10Keyword != null) ? c10Keyword : (c10Keyword = (Keyword)ele1Group().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordFullStop() { return c10KeywordFullStop; }
 
 		// id += ID
-		public Assignment ele11AssignmentId() {
-			return (c11AssignmentId != null) ? c11AssignmentId : (c11AssignmentId = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentId() { return c11AssignmentId; }
 
 		// ID
-		public RuleCall ele110LexerRuleCallID() {
-			return (c110LexerRuleCallID != null) ? c110LexerRuleCallID : (c110LexerRuleCallID = (RuleCall)ele11AssignmentId().eContents().get(0)); 
-		}
+		public RuleCall ele110LexerRuleCallID() { return c110LexerRuleCallID; }
 	}
 	
 	public final static SimpleReconstrTestLanguageGrammarAccess INSTANCE = new SimpleReconstrTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestLexer.java
index 4e9b9b9..0df9669 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g 2008-12-10 12:15:47
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g 2008-12-10 15:09:25
 
 package org.eclipse.xtext.parsetree.transientvalues.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestParser.java
index ac50a10..38920b8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTestParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g 2008-12-10 12:15:47
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/transientvalues/parser/internal/InternalTransientValuesTest.g 2008-12-10 15:09:25
 
 package org.eclipse.xtext.parsetree.transientvalues.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parsetree/reconstr/TransientValuesTestParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parsetree/reconstr/TransientValuesTestParseTreeConstructor.java
index e466003..c6678b6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parsetree/reconstr/TransientValuesTestParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/parsetree/reconstr/TransientValuesTestParseTreeConstructor.java
@@ -440,7 +440,7 @@ protected class TestOptional_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return TransientValuesTestGrammarAccess.INSTANCE.prTestOptional().ele10Keyword();
+		return TransientValuesTestGrammarAccess.INSTANCE.prTestOptional().ele10KeywordColon();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java
index a339185..081a5dd 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/services/TransientValuesTestGrammarAccess.java
@@ -11,201 +11,139 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class TransientValuesTestGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class RootElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Keyword c0KeywordTest;
-		private Alternatives c1Alternatives;
-		private Alternatives c10Alternatives;
-		private RuleCall c100ParserRuleCallTestRequired;
-		private RuleCall c101ParserRuleCallTestOptional;
-		private RuleCall c11ParserRuleCallTestList;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordTest = (Keyword)cGroup.eContents().get(0);
+		private final Alternatives c1Alternatives = (Alternatives)cGroup.eContents().get(1);
+		private final Alternatives c10Alternatives = (Alternatives)c1Alternatives.eContents().get(0);
+		private final RuleCall c100ParserRuleCallTestRequired = (RuleCall)c10Alternatives.eContents().get(0);
+		private final RuleCall c101ParserRuleCallTestOptional = (RuleCall)c10Alternatives.eContents().get(1);
+		private final RuleCall c11ParserRuleCallTestList = (RuleCall)c1Alternatives.eContents().get(1);
 		
 		// Root : 'test' ( TestRequired | TestOptional | TestList ) ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'test' ( TestRequired | TestOptional | TestList )
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'test'
-		public Keyword ele0KeywordTest() {
-			return (c0KeywordTest != null) ? c0KeywordTest : (c0KeywordTest = (Keyword)eleGroup().eContents().get(0)); 
-		}
+		public Keyword ele0KeywordTest() { return c0KeywordTest; }
 
 		// TestRequired | TestOptional | TestList
-		public Alternatives ele1Alternatives() {
-			return (c1Alternatives != null) ? c1Alternatives : (c1Alternatives = (Alternatives)eleGroup().eContents().get(1)); 
-		}
+		public Alternatives ele1Alternatives() { return c1Alternatives; }
 
 		// TestRequired | TestOptional
-		public Alternatives ele10Alternatives() {
-			return (c10Alternatives != null) ? c10Alternatives : (c10Alternatives = (Alternatives)ele1Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele10Alternatives() { return c10Alternatives; }
 
 		// TestRequired
-		public RuleCall ele100ParserRuleCallTestRequired() {
-			return (c100ParserRuleCallTestRequired != null) ? c100ParserRuleCallTestRequired : (c100ParserRuleCallTestRequired = (RuleCall)ele10Alternatives().eContents().get(0)); 
-		}
+		public RuleCall ele100ParserRuleCallTestRequired() { return c100ParserRuleCallTestRequired; }
 
 		// TestOptional
-		public RuleCall ele101ParserRuleCallTestOptional() {
-			return (c101ParserRuleCallTestOptional != null) ? c101ParserRuleCallTestOptional : (c101ParserRuleCallTestOptional = (RuleCall)ele10Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele101ParserRuleCallTestOptional() { return c101ParserRuleCallTestOptional; }
 
 		// TestList
-		public RuleCall ele11ParserRuleCallTestList() {
-			return (c11ParserRuleCallTestList != null) ? c11ParserRuleCallTestList : (c11ParserRuleCallTestList = (RuleCall)ele1Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele11ParserRuleCallTestList() { return c11ParserRuleCallTestList; }
 	}
 
 	public class TestRequiredElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Keyword c00KeywordRequired;
-		private Assignment c01AssignmentRequired1;
-		private RuleCall c010LexerRuleCallINT;
-		private Assignment c1AssignmentRequired2;
-		private RuleCall c10LexerRuleCallINT;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Keyword c00KeywordRequired = (Keyword)c0Group.eContents().get(0);
+		private final Assignment c01AssignmentRequired1 = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallINT = (RuleCall)c01AssignmentRequired1.eContents().get(0);
+		private final Assignment c1AssignmentRequired2 = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallINT = (RuleCall)c1AssignmentRequired2.eContents().get(0);
 		
 		// TestRequired : 'required' required1 = INT required2 = INT ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'required' required1 = INT required2 = INT
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'required' required1 = INT
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'required'
-		public Keyword ele00KeywordRequired() {
-			return (c00KeywordRequired != null) ? c00KeywordRequired : (c00KeywordRequired = (Keyword)ele0Group().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordRequired() { return c00KeywordRequired; }
 
 		// required1 = INT
-		public Assignment ele01AssignmentRequired1() {
-			return (c01AssignmentRequired1 != null) ? c01AssignmentRequired1 : (c01AssignmentRequired1 = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentRequired1() { return c01AssignmentRequired1; }
 
 		// INT
-		public RuleCall ele010LexerRuleCallINT() {
-			return (c010LexerRuleCallINT != null) ? c010LexerRuleCallINT : (c010LexerRuleCallINT = (RuleCall)ele01AssignmentRequired1().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallINT() { return c010LexerRuleCallINT; }
 
 		// required2 = INT
-		public Assignment ele1AssignmentRequired2() {
-			return (c1AssignmentRequired2 != null) ? c1AssignmentRequired2 : (c1AssignmentRequired2 = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentRequired2() { return c1AssignmentRequired2; }
 
 		// INT
-		public RuleCall ele10LexerRuleCallINT() {
-			return (c10LexerRuleCallINT != null) ? c10LexerRuleCallINT : (c10LexerRuleCallINT = (RuleCall)ele1AssignmentRequired2().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallINT() { return c10LexerRuleCallINT; }
 	}
 
 	public class TestOptionalElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Keyword c00KeywordOptional;
-		private Assignment c01AssignmentOpt1;
-		private RuleCall c010LexerRuleCallINT;
-		private Group c1Group;
-		private Keyword c10Keyword;
-		private Assignment c11AssignmentOpt2;
-		private RuleCall c110LexerRuleCallINT;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Keyword c00KeywordOptional = (Keyword)c0Group.eContents().get(0);
+		private final Assignment c01AssignmentOpt1 = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallINT = (RuleCall)c01AssignmentOpt1.eContents().get(0);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Keyword c10KeywordColon = (Keyword)c1Group.eContents().get(0);
+		private final Assignment c11AssignmentOpt2 = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110LexerRuleCallINT = (RuleCall)c11AssignmentOpt2.eContents().get(0);
 		
 		// TestOptional : 'optional' ( opt1 = INT ) ? ( ':' opt2 = INT ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'optional' ( opt1 = INT ) ? ( ':' opt2 = INT ) ?
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'optional' ( opt1 = INT ) ?
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'optional'
-		public Keyword ele00KeywordOptional() {
-			return (c00KeywordOptional != null) ? c00KeywordOptional : (c00KeywordOptional = (Keyword)ele0Group().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordOptional() { return c00KeywordOptional; }
 
 		// ( opt1 = INT ) ?
-		public Assignment ele01AssignmentOpt1() {
-			return (c01AssignmentOpt1 != null) ? c01AssignmentOpt1 : (c01AssignmentOpt1 = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentOpt1() { return c01AssignmentOpt1; }
 
 		// INT
-		public RuleCall ele010LexerRuleCallINT() {
-			return (c010LexerRuleCallINT != null) ? c010LexerRuleCallINT : (c010LexerRuleCallINT = (RuleCall)ele01AssignmentOpt1().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallINT() { return c010LexerRuleCallINT; }
 
 		// ( ':' opt2 = INT ) ?
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// ':'
-		public Keyword ele10Keyword() {
-			return (c10Keyword != null) ? c10Keyword : (c10Keyword = (Keyword)ele1Group().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordColon() { return c10KeywordColon; }
 
 		// opt2 = INT
-		public Assignment ele11AssignmentOpt2() {
-			return (c11AssignmentOpt2 != null) ? c11AssignmentOpt2 : (c11AssignmentOpt2 = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentOpt2() { return c11AssignmentOpt2; }
 
 		// INT
-		public RuleCall ele110LexerRuleCallINT() {
-			return (c110LexerRuleCallINT != null) ? c110LexerRuleCallINT : (c110LexerRuleCallINT = (RuleCall)ele11AssignmentOpt2().eContents().get(0)); 
-		}
+		public RuleCall ele110LexerRuleCallINT() { return c110LexerRuleCallINT; }
 	}
 
 	public class TestListElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Keyword c0KeywordList;
-		private Assignment c1AssignmentItem;
-		private RuleCall c10LexerRuleCallINT;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordList = (Keyword)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentItem = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallINT = (RuleCall)c1AssignmentItem.eContents().get(0);
 		
 		// TestList : 'list' ( item += INT ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'list' ( item += INT ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'list'
-		public Keyword ele0KeywordList() {
-			return (c0KeywordList != null) ? c0KeywordList : (c0KeywordList = (Keyword)eleGroup().eContents().get(0)); 
-		}
+		public Keyword ele0KeywordList() { return c0KeywordList; }
 
 		// ( item += INT ) *
-		public Assignment ele1AssignmentItem() {
-			return (c1AssignmentItem != null) ? c1AssignmentItem : (c1AssignmentItem = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentItem() { return c1AssignmentItem; }
 
 		// INT
-		public RuleCall ele10LexerRuleCallINT() {
-			return (c10LexerRuleCallINT != null) ? c10LexerRuleCallINT : (c10LexerRuleCallINT = (RuleCall)ele1AssignmentItem().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallINT() { return c10LexerRuleCallINT; }
 	}
 	
 	public final static TransientValuesTestGrammarAccess INSTANCE = new TransientValuesTestGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java
index 93ac29b..fe2de44 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/services/XtextGrammarTestLanguageGrammarAccess.java
@@ -11,1251 +11,853 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class XtextGrammarTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class GrammarElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Alternatives c00000Alternatives;
-		private Assignment c000000AssignmentAbstract;
-		private Keyword c0000000KeywordAbstractLanguage;
-		private Keyword c000001KeywordLanguage;
-		private Assignment c00001AssignmentIdElements;
-		private RuleCall c000010LexerRuleCallID;
-		private Group c0001Group;
-		private Keyword c00010Keyword;
-		private Assignment c00011AssignmentIdElements;
-		private RuleCall c000110LexerRuleCallID;
-		private Group c001Group;
-		private Group c0010Group;
-		private Keyword c00100KeywordExtends;
-		private Assignment c00101AssignmentSuperGrammarIdElements;
-		private RuleCall c001010LexerRuleCallID;
-		private Group c0011Group;
-		private Keyword c00110Keyword;
-		private Assignment c00111AssignmentSuperGrammarIdElements;
-		private RuleCall c001110LexerRuleCallID;
-		private Assignment c01AssignmentMetamodelDeclarations;
-		private RuleCall c010ParserRuleCallAbstractMetamodelDeclaration;
-		private Assignment c1AssignmentRules;
-		private RuleCall c10ParserRuleCallAbstractRule;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Alternatives c00000Alternatives = (Alternatives)c0000Group.eContents().get(0);
+		private final Assignment c000000AssignmentAbstract = (Assignment)c00000Alternatives.eContents().get(0);
+		private final Keyword c0000000KeywordAbstractLanguage = (Keyword)c000000AssignmentAbstract.eContents().get(0);
+		private final Keyword c000001KeywordLanguage = (Keyword)c00000Alternatives.eContents().get(1);
+		private final Assignment c00001AssignmentIdElements = (Assignment)c0000Group.eContents().get(1);
+		private final RuleCall c000010LexerRuleCallID = (RuleCall)c00001AssignmentIdElements.eContents().get(0);
+		private final Group c0001Group = (Group)c000Group.eContents().get(1);
+		private final Keyword c00010KeywordFullStop = (Keyword)c0001Group.eContents().get(0);
+		private final Assignment c00011AssignmentIdElements = (Assignment)c0001Group.eContents().get(1);
+		private final RuleCall c000110LexerRuleCallID = (RuleCall)c00011AssignmentIdElements.eContents().get(0);
+		private final Group c001Group = (Group)c00Group.eContents().get(1);
+		private final Group c0010Group = (Group)c001Group.eContents().get(0);
+		private final Keyword c00100KeywordExtends = (Keyword)c0010Group.eContents().get(0);
+		private final Assignment c00101AssignmentSuperGrammarIdElements = (Assignment)c0010Group.eContents().get(1);
+		private final RuleCall c001010LexerRuleCallID = (RuleCall)c00101AssignmentSuperGrammarIdElements.eContents().get(0);
+		private final Group c0011Group = (Group)c001Group.eContents().get(1);
+		private final Keyword c00110KeywordFullStop = (Keyword)c0011Group.eContents().get(0);
+		private final Assignment c00111AssignmentSuperGrammarIdElements = (Assignment)c0011Group.eContents().get(1);
+		private final RuleCall c001110LexerRuleCallID = (RuleCall)c00111AssignmentSuperGrammarIdElements.eContents().get(0);
+		private final Assignment c01AssignmentMetamodelDeclarations = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallAbstractMetamodelDeclaration = (RuleCall)c01AssignmentMetamodelDeclarations.eContents().get(0);
+		private final Assignment c1AssignmentRules = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallAbstractRule = (RuleCall)c1AssignmentRules.eContents().get(0);
 		
 		// Grammar : ( abstract ?= 'abstract language' | 'language' ) idElements += ID ( '.' idElements += ID ) * ( 'extends' superGrammarIdElements += ID ( '.' superGrammarIdElements += ID ) * ) ? ( metamodelDeclarations += AbstractMetamodelDeclaration ) * ( rules += AbstractRule ) + ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( abstract ?= 'abstract language' | 'language' ) idElements += ID ( '.' idElements += ID ) * ( 'extends' superGrammarIdElements += ID ( '.' superGrammarIdElements += ID ) * ) ? ( metamodelDeclarations += AbstractMetamodelDeclaration ) * ( rules += AbstractRule ) +
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// ( abstract ?= 'abstract language' | 'language' ) idElements += ID ( '.' idElements += ID ) * ( 'extends' superGrammarIdElements += ID ( '.' superGrammarIdElements += ID ) * ) ? ( metamodelDeclarations += AbstractMetamodelDeclaration ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// ( abstract ?= 'abstract language' | 'language' ) idElements += ID ( '.' idElements += ID ) * ( 'extends' superGrammarIdElements += ID ( '.' superGrammarIdElements += ID ) * ) ?
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// ( abstract ?= 'abstract language' | 'language' ) idElements += ID ( '.' idElements += ID ) *
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// ( abstract ?= 'abstract language' | 'language' ) idElements += ID
-		public Group ele0000Group() {
-			return (c0000Group != null) ? c0000Group : (c0000Group = (Group)ele000Group().eContents().get(0)); 
-		}
+		public Group ele0000Group() { return c0000Group; }
 
 		// abstract ?= 'abstract language' | 'language'
-		public Alternatives ele00000Alternatives() {
-			return (c00000Alternatives != null) ? c00000Alternatives : (c00000Alternatives = (Alternatives)ele0000Group().eContents().get(0)); 
-		}
+		public Alternatives ele00000Alternatives() { return c00000Alternatives; }
 
 		// abstract ?= 'abstract language'
-		public Assignment ele000000AssignmentAbstract() {
-			return (c000000AssignmentAbstract != null) ? c000000AssignmentAbstract : (c000000AssignmentAbstract = (Assignment)ele00000Alternatives().eContents().get(0)); 
-		}
+		public Assignment ele000000AssignmentAbstract() { return c000000AssignmentAbstract; }
 
 		// 'abstract language'
-		public Keyword ele0000000KeywordAbstractLanguage() {
-			return (c0000000KeywordAbstractLanguage != null) ? c0000000KeywordAbstractLanguage : (c0000000KeywordAbstractLanguage = (Keyword)ele000000AssignmentAbstract().eContents().get(0)); 
-		}
+		public Keyword ele0000000KeywordAbstractLanguage() { return c0000000KeywordAbstractLanguage; }
 
 		// 'language'
-		public Keyword ele000001KeywordLanguage() {
-			return (c000001KeywordLanguage != null) ? c000001KeywordLanguage : (c000001KeywordLanguage = (Keyword)ele00000Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele000001KeywordLanguage() { return c000001KeywordLanguage; }
 
 		// idElements += ID
-		public Assignment ele00001AssignmentIdElements() {
-			return (c00001AssignmentIdElements != null) ? c00001AssignmentIdElements : (c00001AssignmentIdElements = (Assignment)ele0000Group().eContents().get(1)); 
-		}
+		public Assignment ele00001AssignmentIdElements() { return c00001AssignmentIdElements; }
 
 		// ID
-		public RuleCall ele000010LexerRuleCallID() {
-			return (c000010LexerRuleCallID != null) ? c000010LexerRuleCallID : (c000010LexerRuleCallID = (RuleCall)ele00001AssignmentIdElements().eContents().get(0)); 
-		}
+		public RuleCall ele000010LexerRuleCallID() { return c000010LexerRuleCallID; }
 
 		// ( '.' idElements += ID ) *
-		public Group ele0001Group() {
-			return (c0001Group != null) ? c0001Group : (c0001Group = (Group)ele000Group().eContents().get(1)); 
-		}
+		public Group ele0001Group() { return c0001Group; }
 
 		// '.'
-		public Keyword ele00010Keyword() {
-			return (c00010Keyword != null) ? c00010Keyword : (c00010Keyword = (Keyword)ele0001Group().eContents().get(0)); 
-		}
+		public Keyword ele00010KeywordFullStop() { return c00010KeywordFullStop; }
 
 		// idElements += ID
-		public Assignment ele00011AssignmentIdElements() {
-			return (c00011AssignmentIdElements != null) ? c00011AssignmentIdElements : (c00011AssignmentIdElements = (Assignment)ele0001Group().eContents().get(1)); 
-		}
+		public Assignment ele00011AssignmentIdElements() { return c00011AssignmentIdElements; }
 
 		// ID
-		public RuleCall ele000110LexerRuleCallID() {
-			return (c000110LexerRuleCallID != null) ? c000110LexerRuleCallID : (c000110LexerRuleCallID = (RuleCall)ele00011AssignmentIdElements().eContents().get(0)); 
-		}
+		public RuleCall ele000110LexerRuleCallID() { return c000110LexerRuleCallID; }
 
 		// ( 'extends' superGrammarIdElements += ID ( '.' superGrammarIdElements += ID ) * ) ?
-		public Group ele001Group() {
-			return (c001Group != null) ? c001Group : (c001Group = (Group)ele00Group().eContents().get(1)); 
-		}
+		public Group ele001Group() { return c001Group; }
 
 		// 'extends' superGrammarIdElements += ID
-		public Group ele0010Group() {
-			return (c0010Group != null) ? c0010Group : (c0010Group = (Group)ele001Group().eContents().get(0)); 
-		}
+		public Group ele0010Group() { return c0010Group; }
 
 		// 'extends'
-		public Keyword ele00100KeywordExtends() {
-			return (c00100KeywordExtends != null) ? c00100KeywordExtends : (c00100KeywordExtends = (Keyword)ele0010Group().eContents().get(0)); 
-		}
+		public Keyword ele00100KeywordExtends() { return c00100KeywordExtends; }
 
 		// superGrammarIdElements += ID
-		public Assignment ele00101AssignmentSuperGrammarIdElements() {
-			return (c00101AssignmentSuperGrammarIdElements != null) ? c00101AssignmentSuperGrammarIdElements : (c00101AssignmentSuperGrammarIdElements = (Assignment)ele0010Group().eContents().get(1)); 
-		}
+		public Assignment ele00101AssignmentSuperGrammarIdElements() { return c00101AssignmentSuperGrammarIdElements; }
 
 		// ID
-		public RuleCall ele001010LexerRuleCallID() {
-			return (c001010LexerRuleCallID != null) ? c001010LexerRuleCallID : (c001010LexerRuleCallID = (RuleCall)ele00101AssignmentSuperGrammarIdElements().eContents().get(0)); 
-		}
+		public RuleCall ele001010LexerRuleCallID() { return c001010LexerRuleCallID; }
 
 		// ( '.' superGrammarIdElements += ID ) *
-		public Group ele0011Group() {
-			return (c0011Group != null) ? c0011Group : (c0011Group = (Group)ele001Group().eContents().get(1)); 
-		}
+		public Group ele0011Group() { return c0011Group; }
 
 		// '.'
-		public Keyword ele00110Keyword() {
-			return (c00110Keyword != null) ? c00110Keyword : (c00110Keyword = (Keyword)ele0011Group().eContents().get(0)); 
-		}
+		public Keyword ele00110KeywordFullStop() { return c00110KeywordFullStop; }
 
 		// superGrammarIdElements += ID
-		public Assignment ele00111AssignmentSuperGrammarIdElements() {
-			return (c00111AssignmentSuperGrammarIdElements != null) ? c00111AssignmentSuperGrammarIdElements : (c00111AssignmentSuperGrammarIdElements = (Assignment)ele0011Group().eContents().get(1)); 
-		}
+		public Assignment ele00111AssignmentSuperGrammarIdElements() { return c00111AssignmentSuperGrammarIdElements; }
 
 		// ID
-		public RuleCall ele001110LexerRuleCallID() {
-			return (c001110LexerRuleCallID != null) ? c001110LexerRuleCallID : (c001110LexerRuleCallID = (RuleCall)ele00111AssignmentSuperGrammarIdElements().eContents().get(0)); 
-		}
+		public RuleCall ele001110LexerRuleCallID() { return c001110LexerRuleCallID; }
 
 		// ( metamodelDeclarations += AbstractMetamodelDeclaration ) *
-		public Assignment ele01AssignmentMetamodelDeclarations() {
-			return (c01AssignmentMetamodelDeclarations != null) ? c01AssignmentMetamodelDeclarations : (c01AssignmentMetamodelDeclarations = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentMetamodelDeclarations() { return c01AssignmentMetamodelDeclarations; }
 
 		// AbstractMetamodelDeclaration
-		public RuleCall ele010ParserRuleCallAbstractMetamodelDeclaration() {
-			return (c010ParserRuleCallAbstractMetamodelDeclaration != null) ? c010ParserRuleCallAbstractMetamodelDeclaration : (c010ParserRuleCallAbstractMetamodelDeclaration = (RuleCall)ele01AssignmentMetamodelDeclarations().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallAbstractMetamodelDeclaration() { return c010ParserRuleCallAbstractMetamodelDeclaration; }
 
 		// ( rules += AbstractRule ) +
-		public Assignment ele1AssignmentRules() {
-			return (c1AssignmentRules != null) ? c1AssignmentRules : (c1AssignmentRules = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentRules() { return c1AssignmentRules; }
 
 		// AbstractRule
-		public RuleCall ele10ParserRuleCallAbstractRule() {
-			return (c10ParserRuleCallAbstractRule != null) ? c10ParserRuleCallAbstractRule : (c10ParserRuleCallAbstractRule = (RuleCall)ele1AssignmentRules().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallAbstractRule() { return c10ParserRuleCallAbstractRule; }
 	}
 
 	public class AbstractRuleElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private RuleCall c0ParserRuleCallLexerRule;
-		private RuleCall c1ParserRuleCallParserRule;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallLexerRule = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall c1ParserRuleCallParserRule = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// AbstractRule : LexerRule | ParserRule ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// LexerRule | ParserRule
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// LexerRule
-		public RuleCall ele0ParserRuleCallLexerRule() {
-			return (c0ParserRuleCallLexerRule != null) ? c0ParserRuleCallLexerRule : (c0ParserRuleCallLexerRule = (RuleCall)eleAlternatives().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallLexerRule() { return c0ParserRuleCallLexerRule; }
 
 		// ParserRule
-		public RuleCall ele1ParserRuleCallParserRule() {
-			return (c1ParserRuleCallParserRule != null) ? c1ParserRuleCallParserRule : (c1ParserRuleCallParserRule = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallParserRule() { return c1ParserRuleCallParserRule; }
 	}
 
 	public class AbstractMetamodelDeclarationElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private RuleCall c0ParserRuleCallGeneratedMetamodel;
-		private RuleCall c1ParserRuleCallReferencedMetamodel;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallGeneratedMetamodel = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall c1ParserRuleCallReferencedMetamodel = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// AbstractMetamodelDeclaration : GeneratedMetamodel | ReferencedMetamodel ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// GeneratedMetamodel | ReferencedMetamodel
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// GeneratedMetamodel
-		public RuleCall ele0ParserRuleCallGeneratedMetamodel() {
-			return (c0ParserRuleCallGeneratedMetamodel != null) ? c0ParserRuleCallGeneratedMetamodel : (c0ParserRuleCallGeneratedMetamodel = (RuleCall)eleAlternatives().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallGeneratedMetamodel() { return c0ParserRuleCallGeneratedMetamodel; }
 
 		// ReferencedMetamodel
-		public RuleCall ele1ParserRuleCallReferencedMetamodel() {
-			return (c1ParserRuleCallReferencedMetamodel != null) ? c1ParserRuleCallReferencedMetamodel : (c1ParserRuleCallReferencedMetamodel = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallReferencedMetamodel() { return c1ParserRuleCallReferencedMetamodel; }
 	}
 
 	public class GeneratedMetamodelElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordGenerate;
-		private Assignment c001AssignmentName;
-		private RuleCall c0010LexerRuleCallID;
-		private Assignment c01AssignmentNsURI;
-		private RuleCall c010LexerRuleCallSTRING;
-		private Group c1Group;
-		private Keyword c10KeywordAs;
-		private Assignment c11AssignmentAlias;
-		private RuleCall c110LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(5);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordGenerate = (Keyword)c00Group.eContents().get(0);
+		private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010LexerRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0);
+		private final Assignment c01AssignmentNsURI = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallSTRING = (RuleCall)c01AssignmentNsURI.eContents().get(0);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Keyword c10KeywordAs = (Keyword)c1Group.eContents().get(0);
+		private final Assignment c11AssignmentAlias = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110LexerRuleCallID = (RuleCall)c11AssignmentAlias.eContents().get(0);
 		
 		// GeneratedMetamodel : 'generate' name = ID nsURI = STRING ( 'as' alias = ID ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(5)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'generate' name = ID nsURI = STRING ( 'as' alias = ID ) ?
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'generate' name = ID nsURI = STRING
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'generate' name = ID
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'generate'
-		public Keyword ele000KeywordGenerate() {
-			return (c000KeywordGenerate != null) ? c000KeywordGenerate : (c000KeywordGenerate = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordGenerate() { return c000KeywordGenerate; }
 
 		// name = ID
-		public Assignment ele001AssignmentName() {
-			return (c001AssignmentName != null) ? c001AssignmentName : (c001AssignmentName = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentName() { return c001AssignmentName; }
 
 		// ID
-		public RuleCall ele0010LexerRuleCallID() {
-			return (c0010LexerRuleCallID != null) ? c0010LexerRuleCallID : (c0010LexerRuleCallID = (RuleCall)ele001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0010LexerRuleCallID() { return c0010LexerRuleCallID; }
 
 		// nsURI = STRING
-		public Assignment ele01AssignmentNsURI() {
-			return (c01AssignmentNsURI != null) ? c01AssignmentNsURI : (c01AssignmentNsURI = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentNsURI() { return c01AssignmentNsURI; }
 
 		// STRING
-		public RuleCall ele010LexerRuleCallSTRING() {
-			return (c010LexerRuleCallSTRING != null) ? c010LexerRuleCallSTRING : (c010LexerRuleCallSTRING = (RuleCall)ele01AssignmentNsURI().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallSTRING() { return c010LexerRuleCallSTRING; }
 
 		// ( 'as' alias = ID ) ?
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// 'as'
-		public Keyword ele10KeywordAs() {
-			return (c10KeywordAs != null) ? c10KeywordAs : (c10KeywordAs = (Keyword)ele1Group().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordAs() { return c10KeywordAs; }
 
 		// alias = ID
-		public Assignment ele11AssignmentAlias() {
-			return (c11AssignmentAlias != null) ? c11AssignmentAlias : (c11AssignmentAlias = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentAlias() { return c11AssignmentAlias; }
 
 		// ID
-		public RuleCall ele110LexerRuleCallID() {
-			return (c110LexerRuleCallID != null) ? c110LexerRuleCallID : (c110LexerRuleCallID = (RuleCall)ele11AssignmentAlias().eContents().get(0)); 
-		}
+		public RuleCall ele110LexerRuleCallID() { return c110LexerRuleCallID; }
 	}
 
 	public class ReferencedMetamodelElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Keyword c00KeywordImport;
-		private Assignment c01AssignmentUri;
-		private RuleCall c010LexerRuleCallSTRING;
-		private Group c1Group;
-		private Keyword c10KeywordAs;
-		private Assignment c11AssignmentAlias;
-		private RuleCall c110LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(6);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Keyword c00KeywordImport = (Keyword)c0Group.eContents().get(0);
+		private final Assignment c01AssignmentUri = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallSTRING = (RuleCall)c01AssignmentUri.eContents().get(0);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Keyword c10KeywordAs = (Keyword)c1Group.eContents().get(0);
+		private final Assignment c11AssignmentAlias = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110LexerRuleCallID = (RuleCall)c11AssignmentAlias.eContents().get(0);
 		
 		// ReferencedMetamodel : 'import' uri = STRING ( 'as' alias = ID ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(6)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'import' uri = STRING ( 'as' alias = ID ) ?
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'import' uri = STRING
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'import'
-		public Keyword ele00KeywordImport() {
-			return (c00KeywordImport != null) ? c00KeywordImport : (c00KeywordImport = (Keyword)ele0Group().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordImport() { return c00KeywordImport; }
 
 		// uri = STRING
-		public Assignment ele01AssignmentUri() {
-			return (c01AssignmentUri != null) ? c01AssignmentUri : (c01AssignmentUri = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentUri() { return c01AssignmentUri; }
 
 		// STRING
-		public RuleCall ele010LexerRuleCallSTRING() {
-			return (c010LexerRuleCallSTRING != null) ? c010LexerRuleCallSTRING : (c010LexerRuleCallSTRING = (RuleCall)ele01AssignmentUri().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallSTRING() { return c010LexerRuleCallSTRING; }
 
 		// ( 'as' alias = ID ) ?
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// 'as'
-		public Keyword ele10KeywordAs() {
-			return (c10KeywordAs != null) ? c10KeywordAs : (c10KeywordAs = (Keyword)ele1Group().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordAs() { return c10KeywordAs; }
 
 		// alias = ID
-		public Assignment ele11AssignmentAlias() {
-			return (c11AssignmentAlias != null) ? c11AssignmentAlias : (c11AssignmentAlias = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentAlias() { return c11AssignmentAlias; }
 
 		// ID
-		public RuleCall ele110LexerRuleCallID() {
-			return (c110LexerRuleCallID != null) ? c110LexerRuleCallID : (c110LexerRuleCallID = (RuleCall)ele11AssignmentAlias().eContents().get(0)); 
-		}
+		public RuleCall ele110LexerRuleCallID() { return c110LexerRuleCallID; }
 	}
 
 	public class LexerRuleElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Alternatives c00000Alternatives;
-		private Keyword c000000KeywordNative;
-		private Keyword c000001KeywordLexer;
-		private Assignment c00001AssignmentName;
-		private RuleCall c000010LexerRuleCallID;
-		private Group c0001Group;
-		private Keyword c00010KeywordReturns;
-		private Assignment c00011AssignmentType;
-		private RuleCall c000110ParserRuleCallTypeRef;
-		private Keyword c001Keyword;
-		private Assignment c01AssignmentBody;
-		private RuleCall c010LexerRuleCallSTRING;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(7);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Alternatives c00000Alternatives = (Alternatives)c0000Group.eContents().get(0);
+		private final Keyword c000000KeywordNative = (Keyword)c00000Alternatives.eContents().get(0);
+		private final Keyword c000001KeywordLexer = (Keyword)c00000Alternatives.eContents().get(1);
+		private final Assignment c00001AssignmentName = (Assignment)c0000Group.eContents().get(1);
+		private final RuleCall c000010LexerRuleCallID = (RuleCall)c00001AssignmentName.eContents().get(0);
+		private final Group c0001Group = (Group)c000Group.eContents().get(1);
+		private final Keyword c00010KeywordReturns = (Keyword)c0001Group.eContents().get(0);
+		private final Assignment c00011AssignmentType = (Assignment)c0001Group.eContents().get(1);
+		private final RuleCall c000110ParserRuleCallTypeRef = (RuleCall)c00011AssignmentType.eContents().get(0);
+		private final Keyword c001KeywordColon = (Keyword)c00Group.eContents().get(1);
+		private final Assignment c01AssignmentBody = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallSTRING = (RuleCall)c01AssignmentBody.eContents().get(0);
+		private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1);
 		
 		// LexerRule : ( 'native' | 'lexer' ) name = ID ( 'returns' type = TypeRef ) ? ':' body = STRING ';' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(7)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( 'native' | 'lexer' ) name = ID ( 'returns' type = TypeRef ) ? ':' body = STRING ';'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// ( 'native' | 'lexer' ) name = ID ( 'returns' type = TypeRef ) ? ':' body = STRING
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// ( 'native' | 'lexer' ) name = ID ( 'returns' type = TypeRef ) ? ':'
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// ( 'native' | 'lexer' ) name = ID ( 'returns' type = TypeRef ) ?
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// ( 'native' | 'lexer' ) name = ID
-		public Group ele0000Group() {
-			return (c0000Group != null) ? c0000Group : (c0000Group = (Group)ele000Group().eContents().get(0)); 
-		}
+		public Group ele0000Group() { return c0000Group; }
 
 		// 'native' | 'lexer'
-		public Alternatives ele00000Alternatives() {
-			return (c00000Alternatives != null) ? c00000Alternatives : (c00000Alternatives = (Alternatives)ele0000Group().eContents().get(0)); 
-		}
+		public Alternatives ele00000Alternatives() { return c00000Alternatives; }
 
 		// 'native'
-		public Keyword ele000000KeywordNative() {
-			return (c000000KeywordNative != null) ? c000000KeywordNative : (c000000KeywordNative = (Keyword)ele00000Alternatives().eContents().get(0)); 
-		}
+		public Keyword ele000000KeywordNative() { return c000000KeywordNative; }
 
 		// 'lexer'
-		public Keyword ele000001KeywordLexer() {
-			return (c000001KeywordLexer != null) ? c000001KeywordLexer : (c000001KeywordLexer = (Keyword)ele00000Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele000001KeywordLexer() { return c000001KeywordLexer; }
 
 		// name = ID
-		public Assignment ele00001AssignmentName() {
-			return (c00001AssignmentName != null) ? c00001AssignmentName : (c00001AssignmentName = (Assignment)ele0000Group().eContents().get(1)); 
-		}
+		public Assignment ele00001AssignmentName() { return c00001AssignmentName; }
 
 		// ID
-		public RuleCall ele000010LexerRuleCallID() {
-			return (c000010LexerRuleCallID != null) ? c000010LexerRuleCallID : (c000010LexerRuleCallID = (RuleCall)ele00001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele000010LexerRuleCallID() { return c000010LexerRuleCallID; }
 
 		// ( 'returns' type = TypeRef ) ?
-		public Group ele0001Group() {
-			return (c0001Group != null) ? c0001Group : (c0001Group = (Group)ele000Group().eContents().get(1)); 
-		}
+		public Group ele0001Group() { return c0001Group; }
 
 		// 'returns'
-		public Keyword ele00010KeywordReturns() {
-			return (c00010KeywordReturns != null) ? c00010KeywordReturns : (c00010KeywordReturns = (Keyword)ele0001Group().eContents().get(0)); 
-		}
+		public Keyword ele00010KeywordReturns() { return c00010KeywordReturns; }
 
 		// type = TypeRef
-		public Assignment ele00011AssignmentType() {
-			return (c00011AssignmentType != null) ? c00011AssignmentType : (c00011AssignmentType = (Assignment)ele0001Group().eContents().get(1)); 
-		}
+		public Assignment ele00011AssignmentType() { return c00011AssignmentType; }
 
 		// TypeRef
-		public RuleCall ele000110ParserRuleCallTypeRef() {
-			return (c000110ParserRuleCallTypeRef != null) ? c000110ParserRuleCallTypeRef : (c000110ParserRuleCallTypeRef = (RuleCall)ele00011AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele000110ParserRuleCallTypeRef() { return c000110ParserRuleCallTypeRef; }
 
 		// ':'
-		public Keyword ele001Keyword() {
-			return (c001Keyword != null) ? c001Keyword : (c001Keyword = (Keyword)ele00Group().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordColon() { return c001KeywordColon; }
 
 		// body = STRING
-		public Assignment ele01AssignmentBody() {
-			return (c01AssignmentBody != null) ? c01AssignmentBody : (c01AssignmentBody = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentBody() { return c01AssignmentBody; }
 
 		// STRING
-		public RuleCall ele010LexerRuleCallSTRING() {
-			return (c010LexerRuleCallSTRING != null) ? c010LexerRuleCallSTRING : (c010LexerRuleCallSTRING = (RuleCall)ele01AssignmentBody().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallSTRING() { return c010LexerRuleCallSTRING; }
 
 		// ';'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; }
 	}
 
 	public class ParserRuleElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Assignment c0000AssignmentName;
-		private RuleCall c00000LexerRuleCallID;
-		private Group c0001Group;
-		private Keyword c00010KeywordReturns;
-		private Assignment c00011AssignmentType;
-		private RuleCall c000110ParserRuleCallTypeRef;
-		private Keyword c001Keyword;
-		private Assignment c01AssignmentAlternatives;
-		private RuleCall c010ParserRuleCallAlternatives;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(8);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Assignment c0000AssignmentName = (Assignment)c000Group.eContents().get(0);
+		private final RuleCall c00000LexerRuleCallID = (RuleCall)c0000AssignmentName.eContents().get(0);
+		private final Group c0001Group = (Group)c000Group.eContents().get(1);
+		private final Keyword c00010KeywordReturns = (Keyword)c0001Group.eContents().get(0);
+		private final Assignment c00011AssignmentType = (Assignment)c0001Group.eContents().get(1);
+		private final RuleCall c000110ParserRuleCallTypeRef = (RuleCall)c00011AssignmentType.eContents().get(0);
+		private final Keyword c001KeywordColon = (Keyword)c00Group.eContents().get(1);
+		private final Assignment c01AssignmentAlternatives = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallAlternatives = (RuleCall)c01AssignmentAlternatives.eContents().get(0);
+		private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1);
 		
 		// ParserRule : name = ID ( 'returns' type = TypeRef ) ? ':' alternatives = Alternatives ';' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(8)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID ( 'returns' type = TypeRef ) ? ':' alternatives = Alternatives ';'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// name = ID ( 'returns' type = TypeRef ) ? ':' alternatives = Alternatives
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// name = ID ( 'returns' type = TypeRef ) ? ':'
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// name = ID ( 'returns' type = TypeRef ) ?
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// name = ID
-		public Assignment ele0000AssignmentName() {
-			return (c0000AssignmentName != null) ? c0000AssignmentName : (c0000AssignmentName = (Assignment)ele000Group().eContents().get(0)); 
-		}
+		public Assignment ele0000AssignmentName() { return c0000AssignmentName; }
 
 		// ID
-		public RuleCall ele00000LexerRuleCallID() {
-			return (c00000LexerRuleCallID != null) ? c00000LexerRuleCallID : (c00000LexerRuleCallID = (RuleCall)ele0000AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00000LexerRuleCallID() { return c00000LexerRuleCallID; }
 
 		// ( 'returns' type = TypeRef ) ?
-		public Group ele0001Group() {
-			return (c0001Group != null) ? c0001Group : (c0001Group = (Group)ele000Group().eContents().get(1)); 
-		}
+		public Group ele0001Group() { return c0001Group; }
 
 		// 'returns'
-		public Keyword ele00010KeywordReturns() {
-			return (c00010KeywordReturns != null) ? c00010KeywordReturns : (c00010KeywordReturns = (Keyword)ele0001Group().eContents().get(0)); 
-		}
+		public Keyword ele00010KeywordReturns() { return c00010KeywordReturns; }
 
 		// type = TypeRef
-		public Assignment ele00011AssignmentType() {
-			return (c00011AssignmentType != null) ? c00011AssignmentType : (c00011AssignmentType = (Assignment)ele0001Group().eContents().get(1)); 
-		}
+		public Assignment ele00011AssignmentType() { return c00011AssignmentType; }
 
 		// TypeRef
-		public RuleCall ele000110ParserRuleCallTypeRef() {
-			return (c000110ParserRuleCallTypeRef != null) ? c000110ParserRuleCallTypeRef : (c000110ParserRuleCallTypeRef = (RuleCall)ele00011AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele000110ParserRuleCallTypeRef() { return c000110ParserRuleCallTypeRef; }
 
 		// ':'
-		public Keyword ele001Keyword() {
-			return (c001Keyword != null) ? c001Keyword : (c001Keyword = (Keyword)ele00Group().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordColon() { return c001KeywordColon; }
 
 		// alternatives = Alternatives
-		public Assignment ele01AssignmentAlternatives() {
-			return (c01AssignmentAlternatives != null) ? c01AssignmentAlternatives : (c01AssignmentAlternatives = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentAlternatives() { return c01AssignmentAlternatives; }
 
 		// Alternatives
-		public RuleCall ele010ParserRuleCallAlternatives() {
-			return (c010ParserRuleCallAlternatives != null) ? c010ParserRuleCallAlternatives : (c010ParserRuleCallAlternatives = (RuleCall)ele01AssignmentAlternatives().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallAlternatives() { return c010ParserRuleCallAlternatives; }
 
 		// ';'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; }
 	}
 
 	public class TypeRefElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Assignment c00AssignmentMetamodel;
-		private CrossReference c000CrossReferenceAbstractMetamodelDeclaration;
-		private Keyword c01Keyword;
-		private Assignment c1AssignmentType;
-		private CrossReference c10CrossReferenceEClassifier;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(9);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Assignment c00AssignmentMetamodel = (Assignment)c0Group.eContents().get(0);
+		private final CrossReference c000CrossReferenceAbstractMetamodelDeclaration = (CrossReference)c00AssignmentMetamodel.eContents().get(0);
+		private final Keyword c01KeywordColonColon = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentType = (Assignment)cGroup.eContents().get(1);
+		private final CrossReference c10CrossReferenceEClassifier = (CrossReference)c1AssignmentType.eContents().get(0);
 		
 		// TypeRef : ( metamodel = [ AbstractMetamodelDeclaration ] '::' ) ? type = [ EClassifier ] ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(9)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( metamodel = [ AbstractMetamodelDeclaration ] '::' ) ? type = [ EClassifier ]
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// ( metamodel = [ AbstractMetamodelDeclaration ] '::' ) ?
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// metamodel = [ AbstractMetamodelDeclaration ]
-		public Assignment ele00AssignmentMetamodel() {
-			return (c00AssignmentMetamodel != null) ? c00AssignmentMetamodel : (c00AssignmentMetamodel = (Assignment)ele0Group().eContents().get(0)); 
-		}
+		public Assignment ele00AssignmentMetamodel() { return c00AssignmentMetamodel; }
 
 		// [ AbstractMetamodelDeclaration ]
-		public CrossReference ele000CrossReferenceAbstractMetamodelDeclaration() {
-			return (c000CrossReferenceAbstractMetamodelDeclaration != null) ? c000CrossReferenceAbstractMetamodelDeclaration : (c000CrossReferenceAbstractMetamodelDeclaration = (CrossReference)ele00AssignmentMetamodel().eContents().get(0)); 
-		}
+		public CrossReference ele000CrossReferenceAbstractMetamodelDeclaration() { return c000CrossReferenceAbstractMetamodelDeclaration; }
 
 		// '::'
-		public Keyword ele01Keyword() {
-			return (c01Keyword != null) ? c01Keyword : (c01Keyword = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordColonColon() { return c01KeywordColonColon; }
 
 		// type = [ EClassifier ]
-		public Assignment ele1AssignmentType() {
-			return (c1AssignmentType != null) ? c1AssignmentType : (c1AssignmentType = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentType() { return c1AssignmentType; }
 
 		// [ EClassifier ]
-		public CrossReference ele10CrossReferenceEClassifier() {
-			return (c10CrossReferenceEClassifier != null) ? c10CrossReferenceEClassifier : (c10CrossReferenceEClassifier = (CrossReference)ele1AssignmentType().eContents().get(0)); 
-		}
+		public CrossReference ele10CrossReferenceEClassifier() { return c10CrossReferenceEClassifier; }
 	}
 
 	public class AlternativesElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private RuleCall c0ParserRuleCallGroup;
-		private Group c1Group;
-		private Group c10Group;
-		private Action c100ActionAlternativesgroups;
-		private Keyword c101Keyword;
-		private Assignment c11AssignmentGroups;
-		private RuleCall c110ParserRuleCallGroup;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(10);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallGroup = (RuleCall)cGroup.eContents().get(0);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Group c10Group = (Group)c1Group.eContents().get(0);
+		private final Action c100ActionAlternativesgroups = (Action)c10Group.eContents().get(0);
+		private final Keyword c101KeywordVerticalLine = (Keyword)c10Group.eContents().get(1);
+		private final Assignment c11AssignmentGroups = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110ParserRuleCallGroup = (RuleCall)c11AssignmentGroups.eContents().get(0);
 		
 		// Alternatives returns AbstractElement : Group ( { current = Alternatives . groups += current } '|' groups += Group ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(10)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// Group ( { current = Alternatives . groups += current } '|' groups += Group ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// Group
-		public RuleCall ele0ParserRuleCallGroup() {
-			return (c0ParserRuleCallGroup != null) ? c0ParserRuleCallGroup : (c0ParserRuleCallGroup = (RuleCall)eleGroup().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallGroup() { return c0ParserRuleCallGroup; }
 
 		// ( { current = Alternatives . groups += current } '|' groups += Group ) *
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// { current = Alternatives . groups += current } '|'
-		public Group ele10Group() {
-			return (c10Group != null) ? c10Group : (c10Group = (Group)ele1Group().eContents().get(0)); 
-		}
+		public Group ele10Group() { return c10Group; }
 
 		// { current = Alternatives . groups += current }
-		public Action ele100ActionAlternativesgroups() {
-			return (c100ActionAlternativesgroups != null) ? c100ActionAlternativesgroups : (c100ActionAlternativesgroups = (Action)ele10Group().eContents().get(0)); 
-		}
+		public Action ele100ActionAlternativesgroups() { return c100ActionAlternativesgroups; }
 
 		// '|'
-		public Keyword ele101Keyword() {
-			return (c101Keyword != null) ? c101Keyword : (c101Keyword = (Keyword)ele10Group().eContents().get(1)); 
-		}
+		public Keyword ele101KeywordVerticalLine() { return c101KeywordVerticalLine; }
 
 		// groups += Group
-		public Assignment ele11AssignmentGroups() {
-			return (c11AssignmentGroups != null) ? c11AssignmentGroups : (c11AssignmentGroups = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentGroups() { return c11AssignmentGroups; }
 
 		// Group
-		public RuleCall ele110ParserRuleCallGroup() {
-			return (c110ParserRuleCallGroup != null) ? c110ParserRuleCallGroup : (c110ParserRuleCallGroup = (RuleCall)ele11AssignmentGroups().eContents().get(0)); 
-		}
+		public RuleCall ele110ParserRuleCallGroup() { return c110ParserRuleCallGroup; }
 	}
 
 	public class GroupElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private RuleCall c0ParserRuleCallAbstractToken;
-		private Group c1Group;
-		private Action c10ActionGroupabstractTokens;
-		private Assignment c11AssignmentAbstractTokens;
-		private RuleCall c110ParserRuleCallAbstractToken;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(11);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallAbstractToken = (RuleCall)cGroup.eContents().get(0);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Action c10ActionGroupabstractTokens = (Action)c1Group.eContents().get(0);
+		private final Assignment c11AssignmentAbstractTokens = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110ParserRuleCallAbstractToken = (RuleCall)c11AssignmentAbstractTokens.eContents().get(0);
 		
 		// Group returns AbstractElement : AbstractToken ( { current = Group . abstractTokens += current } abstractTokens += AbstractToken ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(11)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// AbstractToken ( { current = Group . abstractTokens += current } abstractTokens += AbstractToken ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// AbstractToken
-		public RuleCall ele0ParserRuleCallAbstractToken() {
-			return (c0ParserRuleCallAbstractToken != null) ? c0ParserRuleCallAbstractToken : (c0ParserRuleCallAbstractToken = (RuleCall)eleGroup().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallAbstractToken() { return c0ParserRuleCallAbstractToken; }
 
 		// ( { current = Group . abstractTokens += current } abstractTokens += AbstractToken ) *
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// { current = Group . abstractTokens += current }
-		public Action ele10ActionGroupabstractTokens() {
-			return (c10ActionGroupabstractTokens != null) ? c10ActionGroupabstractTokens : (c10ActionGroupabstractTokens = (Action)ele1Group().eContents().get(0)); 
-		}
+		public Action ele10ActionGroupabstractTokens() { return c10ActionGroupabstractTokens; }
 
 		// abstractTokens += AbstractToken
-		public Assignment ele11AssignmentAbstractTokens() {
-			return (c11AssignmentAbstractTokens != null) ? c11AssignmentAbstractTokens : (c11AssignmentAbstractTokens = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentAbstractTokens() { return c11AssignmentAbstractTokens; }
 
 		// AbstractToken
-		public RuleCall ele110ParserRuleCallAbstractToken() {
-			return (c110ParserRuleCallAbstractToken != null) ? c110ParserRuleCallAbstractToken : (c110ParserRuleCallAbstractToken = (RuleCall)ele11AssignmentAbstractTokens().eContents().get(0)); 
-		}
+		public RuleCall ele110ParserRuleCallAbstractToken() { return c110ParserRuleCallAbstractToken; }
 	}
 
 	public class AbstractTokenElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Alternatives c0Alternatives;
-		private Alternatives c00Alternatives;
-		private RuleCall c000ParserRuleCallAssignment;
-		private RuleCall c001ParserRuleCallAction;
-		private RuleCall c01ParserRuleCallAbstractTerminal;
-		private Assignment c1AssignmentCardinality;
-		private Alternatives c10Alternatives;
-		private Alternatives c100Alternatives;
-		private Keyword c1000Keyword;
-		private Keyword c1001Keyword;
-		private Keyword c101Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(12);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Alternatives c0Alternatives = (Alternatives)cGroup.eContents().get(0);
+		private final Alternatives c00Alternatives = (Alternatives)c0Alternatives.eContents().get(0);
+		private final RuleCall c000ParserRuleCallAssignment = (RuleCall)c00Alternatives.eContents().get(0);
+		private final RuleCall c001ParserRuleCallAction = (RuleCall)c00Alternatives.eContents().get(1);
+		private final RuleCall c01ParserRuleCallAbstractTerminal = (RuleCall)c0Alternatives.eContents().get(1);
+		private final Assignment c1AssignmentCardinality = (Assignment)cGroup.eContents().get(1);
+		private final Alternatives c10Alternatives = (Alternatives)c1AssignmentCardinality.eContents().get(0);
+		private final Alternatives c100Alternatives = (Alternatives)c10Alternatives.eContents().get(0);
+		private final Keyword c1000KeywordQuestionMark = (Keyword)c100Alternatives.eContents().get(0);
+		private final Keyword c1001KeywordAsterisk = (Keyword)c100Alternatives.eContents().get(1);
+		private final Keyword c101KeywordPlusSign = (Keyword)c10Alternatives.eContents().get(1);
 		
 		// AbstractToken returns AbstractElement : ( Assignment | Action | AbstractTerminal ) ( cardinality = ( '?' | '*' | '+' ) ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(12)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( Assignment | Action | AbstractTerminal ) ( cardinality = ( '?' | '*' | '+' ) ) ?
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// Assignment | Action | AbstractTerminal
-		public Alternatives ele0Alternatives() {
-			return (c0Alternatives != null) ? c0Alternatives : (c0Alternatives = (Alternatives)eleGroup().eContents().get(0)); 
-		}
+		public Alternatives ele0Alternatives() { return c0Alternatives; }
 
 		// Assignment | Action
-		public Alternatives ele00Alternatives() {
-			return (c00Alternatives != null) ? c00Alternatives : (c00Alternatives = (Alternatives)ele0Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele00Alternatives() { return c00Alternatives; }
 
 		// Assignment
-		public RuleCall ele000ParserRuleCallAssignment() {
-			return (c000ParserRuleCallAssignment != null) ? c000ParserRuleCallAssignment : (c000ParserRuleCallAssignment = (RuleCall)ele00Alternatives().eContents().get(0)); 
-		}
+		public RuleCall ele000ParserRuleCallAssignment() { return c000ParserRuleCallAssignment; }
 
 		// Action
-		public RuleCall ele001ParserRuleCallAction() {
-			return (c001ParserRuleCallAction != null) ? c001ParserRuleCallAction : (c001ParserRuleCallAction = (RuleCall)ele00Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele001ParserRuleCallAction() { return c001ParserRuleCallAction; }
 
 		// AbstractTerminal
-		public RuleCall ele01ParserRuleCallAbstractTerminal() {
-			return (c01ParserRuleCallAbstractTerminal != null) ? c01ParserRuleCallAbstractTerminal : (c01ParserRuleCallAbstractTerminal = (RuleCall)ele0Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele01ParserRuleCallAbstractTerminal() { return c01ParserRuleCallAbstractTerminal; }
 
 		// ( cardinality = ( '?' | '*' | '+' ) ) ?
-		public Assignment ele1AssignmentCardinality() {
-			return (c1AssignmentCardinality != null) ? c1AssignmentCardinality : (c1AssignmentCardinality = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentCardinality() { return c1AssignmentCardinality; }
 
 		// '?' | '*' | '+'
-		public Alternatives ele10Alternatives() {
-			return (c10Alternatives != null) ? c10Alternatives : (c10Alternatives = (Alternatives)ele1AssignmentCardinality().eContents().get(0)); 
-		}
+		public Alternatives ele10Alternatives() { return c10Alternatives; }
 
 		// '?' | '*'
-		public Alternatives ele100Alternatives() {
-			return (c100Alternatives != null) ? c100Alternatives : (c100Alternatives = (Alternatives)ele10Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele100Alternatives() { return c100Alternatives; }
 
 		// '?'
-		public Keyword ele1000Keyword() {
-			return (c1000Keyword != null) ? c1000Keyword : (c1000Keyword = (Keyword)ele100Alternatives().eContents().get(0)); 
-		}
+		public Keyword ele1000KeywordQuestionMark() { return c1000KeywordQuestionMark; }
 
 		// '*'
-		public Keyword ele1001Keyword() {
-			return (c1001Keyword != null) ? c1001Keyword : (c1001Keyword = (Keyword)ele100Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele1001KeywordAsterisk() { return c1001KeywordAsterisk; }
 
 		// '+'
-		public Keyword ele101Keyword() {
-			return (c101Keyword != null) ? c101Keyword : (c101Keyword = (Keyword)ele10Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele101KeywordPlusSign() { return c101KeywordPlusSign; }
 	}
 
 	public class AssignmentElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Assignment c00AssignmentFeature;
-		private RuleCall c000LexerRuleCallID;
-		private Assignment c01AssignmentOperator;
-		private Alternatives c010Alternatives;
-		private Alternatives c0100Alternatives;
-		private Keyword c01000Keyword;
-		private Keyword c01001Keyword;
-		private Keyword c0101Keyword;
-		private Assignment c1AssignmentTerminal;
-		private RuleCall c10ParserRuleCallAbstractTerminal;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(13);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Assignment c00AssignmentFeature = (Assignment)c0Group.eContents().get(0);
+		private final RuleCall c000LexerRuleCallID = (RuleCall)c00AssignmentFeature.eContents().get(0);
+		private final Assignment c01AssignmentOperator = (Assignment)c0Group.eContents().get(1);
+		private final Alternatives c010Alternatives = (Alternatives)c01AssignmentOperator.eContents().get(0);
+		private final Alternatives c0100Alternatives = (Alternatives)c010Alternatives.eContents().get(0);
+		private final Keyword c01000KeywordPlusSignEqualsSign = (Keyword)c0100Alternatives.eContents().get(0);
+		private final Keyword c01001KeywordEqualsSign = (Keyword)c0100Alternatives.eContents().get(1);
+		private final Keyword c0101KeywordQuestionMarkEqualsSign = (Keyword)c010Alternatives.eContents().get(1);
+		private final Assignment c1AssignmentTerminal = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallAbstractTerminal = (RuleCall)c1AssignmentTerminal.eContents().get(0);
 		
 		// Assignment : feature = ID operator = ( '+=' | '=' | '?=' ) terminal = AbstractTerminal ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(13)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// feature = ID operator = ( '+=' | '=' | '?=' ) terminal = AbstractTerminal
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// feature = ID operator = ( '+=' | '=' | '?=' )
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// feature = ID
-		public Assignment ele00AssignmentFeature() {
-			return (c00AssignmentFeature != null) ? c00AssignmentFeature : (c00AssignmentFeature = (Assignment)ele0Group().eContents().get(0)); 
-		}
+		public Assignment ele00AssignmentFeature() { return c00AssignmentFeature; }
 
 		// ID
-		public RuleCall ele000LexerRuleCallID() {
-			return (c000LexerRuleCallID != null) ? c000LexerRuleCallID : (c000LexerRuleCallID = (RuleCall)ele00AssignmentFeature().eContents().get(0)); 
-		}
+		public RuleCall ele000LexerRuleCallID() { return c000LexerRuleCallID; }
 
 		// operator = ( '+=' | '=' | '?=' )
-		public Assignment ele01AssignmentOperator() {
-			return (c01AssignmentOperator != null) ? c01AssignmentOperator : (c01AssignmentOperator = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentOperator() { return c01AssignmentOperator; }
 
 		// '+=' | '=' | '?='
-		public Alternatives ele010Alternatives() {
-			return (c010Alternatives != null) ? c010Alternatives : (c010Alternatives = (Alternatives)ele01AssignmentOperator().eContents().get(0)); 
-		}
+		public Alternatives ele010Alternatives() { return c010Alternatives; }
 
 		// '+=' | '='
-		public Alternatives ele0100Alternatives() {
-			return (c0100Alternatives != null) ? c0100Alternatives : (c0100Alternatives = (Alternatives)ele010Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele0100Alternatives() { return c0100Alternatives; }
 
 		// '+='
-		public Keyword ele01000Keyword() {
-			return (c01000Keyword != null) ? c01000Keyword : (c01000Keyword = (Keyword)ele0100Alternatives().eContents().get(0)); 
-		}
+		public Keyword ele01000KeywordPlusSignEqualsSign() { return c01000KeywordPlusSignEqualsSign; }
 
 		// '='
-		public Keyword ele01001Keyword() {
-			return (c01001Keyword != null) ? c01001Keyword : (c01001Keyword = (Keyword)ele0100Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele01001KeywordEqualsSign() { return c01001KeywordEqualsSign; }
 
 		// '?='
-		public Keyword ele0101Keyword() {
-			return (c0101Keyword != null) ? c0101Keyword : (c0101Keyword = (Keyword)ele010Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele0101KeywordQuestionMarkEqualsSign() { return c0101KeywordQuestionMarkEqualsSign; }
 
 		// terminal = AbstractTerminal
-		public Assignment ele1AssignmentTerminal() {
-			return (c1AssignmentTerminal != null) ? c1AssignmentTerminal : (c1AssignmentTerminal = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentTerminal() { return c1AssignmentTerminal; }
 
 		// AbstractTerminal
-		public RuleCall ele10ParserRuleCallAbstractTerminal() {
-			return (c10ParserRuleCallAbstractTerminal != null) ? c10ParserRuleCallAbstractTerminal : (c10ParserRuleCallAbstractTerminal = (RuleCall)ele1AssignmentTerminal().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallAbstractTerminal() { return c10ParserRuleCallAbstractTerminal; }
 	}
 
 	public class ActionElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Group c00000Group;
-		private Group c000000Group;
-		private Keyword c0000000Keyword;
-		private Group c0000001Group;
-		private Keyword c00000010KeywordCurrent;
-		private Keyword c00000011Keyword;
-		private Assignment c000001AssignmentTypeName;
-		private RuleCall c0000010ParserRuleCallTypeRef;
-		private Keyword c00001Keyword;
-		private Assignment c0001AssignmentFeature;
-		private RuleCall c00010LexerRuleCallID;
-		private Assignment c001AssignmentOperator;
-		private Alternatives c0010Alternatives;
-		private Keyword c00100Keyword;
-		private Keyword c00101Keyword;
-		private Keyword c01KeywordCurrent;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(14);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Group c00000Group = (Group)c0000Group.eContents().get(0);
+		private final Group c000000Group = (Group)c00000Group.eContents().get(0);
+		private final Keyword c0000000KeywordLeftCurlyBracket = (Keyword)c000000Group.eContents().get(0);
+		private final Group c0000001Group = (Group)c000000Group.eContents().get(1);
+		private final Keyword c00000010KeywordCurrent = (Keyword)c0000001Group.eContents().get(0);
+		private final Keyword c00000011KeywordEqualsSign = (Keyword)c0000001Group.eContents().get(1);
+		private final Assignment c000001AssignmentTypeName = (Assignment)c00000Group.eContents().get(1);
+		private final RuleCall c0000010ParserRuleCallTypeRef = (RuleCall)c000001AssignmentTypeName.eContents().get(0);
+		private final Keyword c00001KeywordFullStop = (Keyword)c0000Group.eContents().get(1);
+		private final Assignment c0001AssignmentFeature = (Assignment)c000Group.eContents().get(1);
+		private final RuleCall c00010LexerRuleCallID = (RuleCall)c0001AssignmentFeature.eContents().get(0);
+		private final Assignment c001AssignmentOperator = (Assignment)c00Group.eContents().get(1);
+		private final Alternatives c0010Alternatives = (Alternatives)c001AssignmentOperator.eContents().get(0);
+		private final Keyword c00100KeywordEqualsSign = (Keyword)c0010Alternatives.eContents().get(0);
+		private final Keyword c00101KeywordPlusSignEqualsSign = (Keyword)c0010Alternatives.eContents().get(1);
+		private final Keyword c01KeywordCurrent = (Keyword)c0Group.eContents().get(1);
+		private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
 		
 		// Action : '{' ( 'current' '=' ) ? typeName = TypeRef '.' feature = ID operator = ( '=' | '+=' ) 'current' '}' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(14)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '{' ( 'current' '=' ) ? typeName = TypeRef '.' feature = ID operator = ( '=' | '+=' ) 'current' '}'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '{' ( 'current' '=' ) ? typeName = TypeRef '.' feature = ID operator = ( '=' | '+=' ) 'current'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '{' ( 'current' '=' ) ? typeName = TypeRef '.' feature = ID operator = ( '=' | '+=' )
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// '{' ( 'current' '=' ) ? typeName = TypeRef '.' feature = ID
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// '{' ( 'current' '=' ) ? typeName = TypeRef '.'
-		public Group ele0000Group() {
-			return (c0000Group != null) ? c0000Group : (c0000Group = (Group)ele000Group().eContents().get(0)); 
-		}
+		public Group ele0000Group() { return c0000Group; }
 
 		// '{' ( 'current' '=' ) ? typeName = TypeRef
-		public Group ele00000Group() {
-			return (c00000Group != null) ? c00000Group : (c00000Group = (Group)ele0000Group().eContents().get(0)); 
-		}
+		public Group ele00000Group() { return c00000Group; }
 
 		// '{' ( 'current' '=' ) ?
-		public Group ele000000Group() {
-			return (c000000Group != null) ? c000000Group : (c000000Group = (Group)ele00000Group().eContents().get(0)); 
-		}
+		public Group ele000000Group() { return c000000Group; }
 
 		// '{'
-		public Keyword ele0000000Keyword() {
-			return (c0000000Keyword != null) ? c0000000Keyword : (c0000000Keyword = (Keyword)ele000000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000000KeywordLeftCurlyBracket() { return c0000000KeywordLeftCurlyBracket; }
 
 		// ( 'current' '=' ) ?
-		public Group ele0000001Group() {
-			return (c0000001Group != null) ? c0000001Group : (c0000001Group = (Group)ele000000Group().eContents().get(1)); 
-		}
+		public Group ele0000001Group() { return c0000001Group; }
 
 		// 'current'
-		public Keyword ele00000010KeywordCurrent() {
-			return (c00000010KeywordCurrent != null) ? c00000010KeywordCurrent : (c00000010KeywordCurrent = (Keyword)ele0000001Group().eContents().get(0)); 
-		}
+		public Keyword ele00000010KeywordCurrent() { return c00000010KeywordCurrent; }
 
 		// '='
-		public Keyword ele00000011Keyword() {
-			return (c00000011Keyword != null) ? c00000011Keyword : (c00000011Keyword = (Keyword)ele0000001Group().eContents().get(1)); 
-		}
+		public Keyword ele00000011KeywordEqualsSign() { return c00000011KeywordEqualsSign; }
 
 		// typeName = TypeRef
-		public Assignment ele000001AssignmentTypeName() {
-			return (c000001AssignmentTypeName != null) ? c000001AssignmentTypeName : (c000001AssignmentTypeName = (Assignment)ele00000Group().eContents().get(1)); 
-		}
+		public Assignment ele000001AssignmentTypeName() { return c000001AssignmentTypeName; }
 
 		// TypeRef
-		public RuleCall ele0000010ParserRuleCallTypeRef() {
-			return (c0000010ParserRuleCallTypeRef != null) ? c0000010ParserRuleCallTypeRef : (c0000010ParserRuleCallTypeRef = (RuleCall)ele000001AssignmentTypeName().eContents().get(0)); 
-		}
+		public RuleCall ele0000010ParserRuleCallTypeRef() { return c0000010ParserRuleCallTypeRef; }
 
 		// '.'
-		public Keyword ele00001Keyword() {
-			return (c00001Keyword != null) ? c00001Keyword : (c00001Keyword = (Keyword)ele0000Group().eContents().get(1)); 
-		}
+		public Keyword ele00001KeywordFullStop() { return c00001KeywordFullStop; }
 
 		// feature = ID
-		public Assignment ele0001AssignmentFeature() {
-			return (c0001AssignmentFeature != null) ? c0001AssignmentFeature : (c0001AssignmentFeature = (Assignment)ele000Group().eContents().get(1)); 
-		}
+		public Assignment ele0001AssignmentFeature() { return c0001AssignmentFeature; }
 
 		// ID
-		public RuleCall ele00010LexerRuleCallID() {
-			return (c00010LexerRuleCallID != null) ? c00010LexerRuleCallID : (c00010LexerRuleCallID = (RuleCall)ele0001AssignmentFeature().eContents().get(0)); 
-		}
+		public RuleCall ele00010LexerRuleCallID() { return c00010LexerRuleCallID; }
 
 		// operator = ( '=' | '+=' )
-		public Assignment ele001AssignmentOperator() {
-			return (c001AssignmentOperator != null) ? c001AssignmentOperator : (c001AssignmentOperator = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentOperator() { return c001AssignmentOperator; }
 
 		// '=' | '+='
-		public Alternatives ele0010Alternatives() {
-			return (c0010Alternatives != null) ? c0010Alternatives : (c0010Alternatives = (Alternatives)ele001AssignmentOperator().eContents().get(0)); 
-		}
+		public Alternatives ele0010Alternatives() { return c0010Alternatives; }
 
 		// '='
-		public Keyword ele00100Keyword() {
-			return (c00100Keyword != null) ? c00100Keyword : (c00100Keyword = (Keyword)ele0010Alternatives().eContents().get(0)); 
-		}
+		public Keyword ele00100KeywordEqualsSign() { return c00100KeywordEqualsSign; }
 
 		// '+='
-		public Keyword ele00101Keyword() {
-			return (c00101Keyword != null) ? c00101Keyword : (c00101Keyword = (Keyword)ele0010Alternatives().eContents().get(1)); 
-		}
+		public Keyword ele00101KeywordPlusSignEqualsSign() { return c00101KeywordPlusSignEqualsSign; }
 
 		// 'current'
-		public Keyword ele01KeywordCurrent() {
-			return (c01KeywordCurrent != null) ? c01KeywordCurrent : (c01KeywordCurrent = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordCurrent() { return c01KeywordCurrent; }
 
 		// '}'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
 	}
 
 	public class AbstractTerminalElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private Alternatives c0Alternatives;
-		private Alternatives c00Alternatives;
-		private RuleCall c000ParserRuleCallKeyword;
-		private RuleCall c001ParserRuleCallRuleCall;
-		private RuleCall c01ParserRuleCallParenthesizedElement;
-		private RuleCall c1ParserRuleCallCrossReference;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(15);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final Alternatives c0Alternatives = (Alternatives)cAlternatives.eContents().get(0);
+		private final Alternatives c00Alternatives = (Alternatives)c0Alternatives.eContents().get(0);
+		private final RuleCall c000ParserRuleCallKeyword = (RuleCall)c00Alternatives.eContents().get(0);
+		private final RuleCall c001ParserRuleCallRuleCall = (RuleCall)c00Alternatives.eContents().get(1);
+		private final RuleCall c01ParserRuleCallParenthesizedElement = (RuleCall)c0Alternatives.eContents().get(1);
+		private final RuleCall c1ParserRuleCallCrossReference = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// AbstractTerminal returns AbstractElement : Keyword | RuleCall | ParenthesizedElement | CrossReference ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(15)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// Keyword | RuleCall | ParenthesizedElement | CrossReference
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// Keyword | RuleCall | ParenthesizedElement
-		public Alternatives ele0Alternatives() {
-			return (c0Alternatives != null) ? c0Alternatives : (c0Alternatives = (Alternatives)eleAlternatives().eContents().get(0)); 
-		}
+		public Alternatives ele0Alternatives() { return c0Alternatives; }
 
 		// Keyword | RuleCall
-		public Alternatives ele00Alternatives() {
-			return (c00Alternatives != null) ? c00Alternatives : (c00Alternatives = (Alternatives)ele0Alternatives().eContents().get(0)); 
-		}
+		public Alternatives ele00Alternatives() { return c00Alternatives; }
 
 		// Keyword
-		public RuleCall ele000ParserRuleCallKeyword() {
-			return (c000ParserRuleCallKeyword != null) ? c000ParserRuleCallKeyword : (c000ParserRuleCallKeyword = (RuleCall)ele00Alternatives().eContents().get(0)); 
-		}
+		public RuleCall ele000ParserRuleCallKeyword() { return c000ParserRuleCallKeyword; }
 
 		// RuleCall
-		public RuleCall ele001ParserRuleCallRuleCall() {
-			return (c001ParserRuleCallRuleCall != null) ? c001ParserRuleCallRuleCall : (c001ParserRuleCallRuleCall = (RuleCall)ele00Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele001ParserRuleCallRuleCall() { return c001ParserRuleCallRuleCall; }
 
 		// ParenthesizedElement
-		public RuleCall ele01ParserRuleCallParenthesizedElement() {
-			return (c01ParserRuleCallParenthesizedElement != null) ? c01ParserRuleCallParenthesizedElement : (c01ParserRuleCallParenthesizedElement = (RuleCall)ele0Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele01ParserRuleCallParenthesizedElement() { return c01ParserRuleCallParenthesizedElement; }
 
 		// CrossReference
-		public RuleCall ele1ParserRuleCallCrossReference() {
-			return (c1ParserRuleCallCrossReference != null) ? c1ParserRuleCallCrossReference : (c1ParserRuleCallCrossReference = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallCrossReference() { return c1ParserRuleCallCrossReference; }
 	}
 
 	public class CrossReferenceElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000Keyword;
-		private Assignment c001AssignmentType;
-		private RuleCall c0010ParserRuleCallTypeRef;
-		private Group c01Group;
-		private Keyword c010Keyword;
-		private Assignment c011AssignmentRule;
-		private CrossReference c0110CrossReferenceAbstractRule;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(16);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordLeftSquareBracket = (Keyword)c00Group.eContents().get(0);
+		private final Assignment c001AssignmentType = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010ParserRuleCallTypeRef = (RuleCall)c001AssignmentType.eContents().get(0);
+		private final Group c01Group = (Group)c0Group.eContents().get(1);
+		private final Keyword c010KeywordVerticalLine = (Keyword)c01Group.eContents().get(0);
+		private final Assignment c011AssignmentRule = (Assignment)c01Group.eContents().get(1);
+		private final CrossReference c0110CrossReferenceAbstractRule = (CrossReference)c011AssignmentRule.eContents().get(0);
+		private final Keyword c1KeywordRightSquareBracket = (Keyword)cGroup.eContents().get(1);
 		
 		// CrossReference : '[' type = TypeRef ( '|' rule = [ AbstractRule ] ) ? ']' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(16)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '[' type = TypeRef ( '|' rule = [ AbstractRule ] ) ? ']'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '[' type = TypeRef ( '|' rule = [ AbstractRule ] ) ?
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '[' type = TypeRef
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// '['
-		public Keyword ele000Keyword() {
-			return (c000Keyword != null) ? c000Keyword : (c000Keyword = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordLeftSquareBracket() { return c000KeywordLeftSquareBracket; }
 
 		// type = TypeRef
-		public Assignment ele001AssignmentType() {
-			return (c001AssignmentType != null) ? c001AssignmentType : (c001AssignmentType = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentType() { return c001AssignmentType; }
 
 		// TypeRef
-		public RuleCall ele0010ParserRuleCallTypeRef() {
-			return (c0010ParserRuleCallTypeRef != null) ? c0010ParserRuleCallTypeRef : (c0010ParserRuleCallTypeRef = (RuleCall)ele001AssignmentType().eContents().get(0)); 
-		}
+		public RuleCall ele0010ParserRuleCallTypeRef() { return c0010ParserRuleCallTypeRef; }
 
 		// ( '|' rule = [ AbstractRule ] ) ?
-		public Group ele01Group() {
-			return (c01Group != null) ? c01Group : (c01Group = (Group)ele0Group().eContents().get(1)); 
-		}
+		public Group ele01Group() { return c01Group; }
 
 		// '|'
-		public Keyword ele010Keyword() {
-			return (c010Keyword != null) ? c010Keyword : (c010Keyword = (Keyword)ele01Group().eContents().get(0)); 
-		}
+		public Keyword ele010KeywordVerticalLine() { return c010KeywordVerticalLine; }
 
 		// rule = [ AbstractRule ]
-		public Assignment ele011AssignmentRule() {
-			return (c011AssignmentRule != null) ? c011AssignmentRule : (c011AssignmentRule = (Assignment)ele01Group().eContents().get(1)); 
-		}
+		public Assignment ele011AssignmentRule() { return c011AssignmentRule; }
 
 		// [ AbstractRule ]
-		public CrossReference ele0110CrossReferenceAbstractRule() {
-			return (c0110CrossReferenceAbstractRule != null) ? c0110CrossReferenceAbstractRule : (c0110CrossReferenceAbstractRule = (CrossReference)ele011AssignmentRule().eContents().get(0)); 
-		}
+		public CrossReference ele0110CrossReferenceAbstractRule() { return c0110CrossReferenceAbstractRule; }
 
 		// ']'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightSquareBracket() { return c1KeywordRightSquareBracket; }
 	}
 
 	public class ParenthesizedElementElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Keyword c00Keyword;
-		private RuleCall c01ParserRuleCallAlternatives;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(17);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Keyword c00KeywordLeftParenthesis = (Keyword)c0Group.eContents().get(0);
+		private final RuleCall c01ParserRuleCallAlternatives = (RuleCall)c0Group.eContents().get(1);
+		private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
 		
 		// ParenthesizedElement returns AbstractElement : '(' Alternatives ')' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(17)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '(' Alternatives ')'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '(' Alternatives
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '('
-		public Keyword ele00Keyword() {
-			return (c00Keyword != null) ? c00Keyword : (c00Keyword = (Keyword)ele0Group().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordLeftParenthesis() { return c00KeywordLeftParenthesis; }
 
 		// Alternatives
-		public RuleCall ele01ParserRuleCallAlternatives() {
-			return (c01ParserRuleCallAlternatives != null) ? c01ParserRuleCallAlternatives : (c01ParserRuleCallAlternatives = (RuleCall)ele0Group().eContents().get(1)); 
-		}
+		public RuleCall ele01ParserRuleCallAlternatives() { return c01ParserRuleCallAlternatives; }
 
 		// ')'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
 	}
 
 	public class KeywordElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentValue;
-		private RuleCall c0LexerRuleCallSTRING;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(18);
+		private final Assignment cAssignmentValue = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0LexerRuleCallSTRING = (RuleCall)cAssignmentValue.eContents().get(0);
 		
 		// Keyword : value = STRING ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(18)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// value = STRING
-		public Assignment eleAssignmentValue() {
-			return (cAssignmentValue != null) ? cAssignmentValue : (cAssignmentValue = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentValue() { return cAssignmentValue; }
 
 		// STRING
-		public RuleCall ele0LexerRuleCallSTRING() {
-			return (c0LexerRuleCallSTRING != null) ? c0LexerRuleCallSTRING : (c0LexerRuleCallSTRING = (RuleCall)eleAssignmentValue().eContents().get(0)); 
-		}
+		public RuleCall ele0LexerRuleCallSTRING() { return c0LexerRuleCallSTRING; }
 	}
 
 	public class RuleCallElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentRule;
-		private CrossReference c0CrossReferenceAbstractRule;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(19);
+		private final Assignment cAssignmentRule = (Assignment)rule.eContents().get(1);
+		private final CrossReference c0CrossReferenceAbstractRule = (CrossReference)cAssignmentRule.eContents().get(0);
 		
 		// RuleCall : rule = [ AbstractRule ] ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(19)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// rule = [ AbstractRule ]
-		public Assignment eleAssignmentRule() {
-			return (cAssignmentRule != null) ? cAssignmentRule : (cAssignmentRule = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentRule() { return cAssignmentRule; }
 
 		// [ AbstractRule ]
-		public CrossReference ele0CrossReferenceAbstractRule() {
-			return (c0CrossReferenceAbstractRule != null) ? c0CrossReferenceAbstractRule : (c0CrossReferenceAbstractRule = (CrossReference)eleAssignmentRule().eContents().get(0)); 
-		}
+		public CrossReference ele0CrossReferenceAbstractRule() { return c0CrossReferenceAbstractRule; }
 	}
 	
 	public final static XtextGrammarTestLanguageGrammarAccess INSTANCE = new XtextGrammarTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
index e06ff31..d5d6059 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
@@ -13,12 +13,12 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="familie" upperBound="-1" eType="//Familie" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Person">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
   <eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java
index aefaec8..0deb0f8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-10 12:15:42
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-10 15:09:19
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java
index 522e962..b1ec527 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-10 12:15:42
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalActionTestLanguage.g 2008-12-10 15:09:19
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java
index faa4e8a..333e800 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-10 12:15:47
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-10 15:09:25
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
index 2b89ae8..980f6ad 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-10 12:15:47
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalContentAssistTestLanguage.g 2008-12-10 15:09:25
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
index f20a44d..4ecfb2d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-10 12:15:45
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-10 15:09:22
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java
index 75b82e3..02594a7 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-10 12:15:44
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalFowlerDslTestLanguage.g 2008-12-10 15:09:22
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageLexer.java
index f24418d..23f6a4f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g 2008-12-10 12:15:41
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g 2008-12-10 15:09:18
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageParser.java
index f5e638e..372222a 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g 2008-12-10 12:15:41
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLexerTestLanguage.g 2008-12-10 15:09:18
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageLexer.java
index 691f5fe..fc1ffcb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g 2008-12-10 12:15:44
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g 2008-12-10 15:09:21
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageParser.java
index ca251dd..243b69f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g 2008-12-10 12:15:43
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalLookaheadTestLanguage.g 2008-12-10 15:09:21
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageLexer.java
index 06cc426..552410d 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g 2008-12-10 12:15:42
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g 2008-12-10 15:09:20
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageParser.java
index 7213761..261ec8b 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g 2008-12-10 12:15:42
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalOptionalEmptyTestLanguage.g 2008-12-10 15:09:20
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java
index 9b9f070..67367df 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-10 12:15:46
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-10 15:09:24
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
index 75139df..a03a212 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-10 12:15:46
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalPartialParserTestLanguage.g 2008-12-10 15:09:24
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageLexer.java
index 91dbdb3..5270e76 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g 2008-12-10 12:15:43
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g 2008-12-10 15:09:20
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageParser.java
index 7849e46..77afa32 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g 2008-12-10 12:15:43
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalReferenceGrammarTestLanguage.g 2008-12-10 15:09:20
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageLexer.java
index 9f82c87..d8ddad8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguage.g 2008-12-10 12:15:41
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguage.g 2008-12-10 15:09:19
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageParser.java
index bb4f577..420b5ad 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguage.g 2008-12-10 12:15:41
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalSimpleExpressionsTestLanguage.g 2008-12-10 15:09:19
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java
index b124f5d..ded5095 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-10 12:15:38
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-10 15:09:16
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java
index 7506e9b..8c5c5c9 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-10 12:15:38
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTestLanguage.g 2008-12-10 15:09:16
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java
index 42bfb84..64a5ca0 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-10 12:15:45
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-10 15:09:23
 
 package org.eclipse.xtext.testlanguages.parser.internal;
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java
index 98a9e78..f9eee55 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguageParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-10 12:15:45
+// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/testlanguages/parser/internal/InternalTreeTestLanguage.g 2008-12-10 15:09:23
 
 package org.eclipse.xtext.testlanguages.parser.internal; 
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java
index 072d42a..43b7466 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ContentAssistTestLanguageParseTreeConstructor.java
@@ -369,7 +369,7 @@ protected class FirstAbstractRuleChild_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prFirstAbstractRuleChild().ele0001Keyword();
+		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prFirstAbstractRuleChild().ele0001KeywordLeftParenthesis();
 	}	
 }
 
@@ -411,7 +411,7 @@ protected class FirstAbstractRuleChild_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prFirstAbstractRuleChild().ele01Keyword();
+		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prFirstAbstractRuleChild().ele01KeywordRightParenthesis();
 	}	
 }
 
@@ -424,7 +424,7 @@ protected class FirstAbstractRuleChild_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prFirstAbstractRuleChild().ele1Keyword();
+		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prFirstAbstractRuleChild().ele1KeywordSemicolon();
 	}	
 }
 
@@ -594,7 +594,7 @@ protected class SecondAbstractRuleChild_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prSecondAbstractRuleChild().ele001Keyword();
+		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prSecondAbstractRuleChild().ele001KeywordColon();
 	}	
 }
 
@@ -636,7 +636,7 @@ protected class SecondAbstractRuleChild_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prSecondAbstractRuleChild().ele1Keyword();
+		return ContentAssistTestLanguageGrammarAccess.INSTANCE.prSecondAbstractRuleChild().ele1KeywordSemicolon();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java
index c5b6f30..3d87522 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/FowlerDslTestLanguageParseTreeConstructor.java
@@ -827,7 +827,7 @@ protected class State_0_0_1_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return FowlerDslTestLanguageGrammarAccess.INSTANCE.prState().ele001001Keyword();
+		return FowlerDslTestLanguageGrammarAccess.INSTANCE.prState().ele001001KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -867,7 +867,7 @@ protected class State_0_0_1_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return FowlerDslTestLanguageGrammarAccess.INSTANCE.prState().ele0011Keyword();
+		return FowlerDslTestLanguageGrammarAccess.INSTANCE.prState().ele0011KeywordRightCurlyBracket();
 	}	
 }
 
@@ -1014,7 +1014,7 @@ protected class Transition_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return FowlerDslTestLanguageGrammarAccess.INSTANCE.prTransition().ele01Keyword();
+		return FowlerDslTestLanguageGrammarAccess.INSTANCE.prTransition().ele01KeywordEqualsSignGreaterThanSign();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java
index 36ad6b1..8a98788 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/PartialParserTestLanguageParseTreeConstructor.java
@@ -201,7 +201,7 @@ protected class Container_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prContainer().ele001Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prContainer().ele001KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -293,7 +293,7 @@ protected class Container_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prContainer().ele1Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prContainer().ele1KeywordRightCurlyBracket();
 	}	
 }
 
@@ -411,7 +411,7 @@ protected class Nested_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prNested().ele001Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prNested().ele001KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -453,7 +453,7 @@ protected class Nested_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prNested().ele1Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prNested().ele1KeywordRightCurlyBracket();
 	}	
 }
 
@@ -666,7 +666,7 @@ protected class Children_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChildren().ele0001Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChildren().ele0001KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -736,7 +736,7 @@ protected class Children_0_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChildren().ele010Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChildren().ele010KeywordComma();
 	}	
 }
 
@@ -778,7 +778,7 @@ protected class Children_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChildren().ele1Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChildren().ele1KeywordRightCurlyBracket();
 	}	
 }
 
@@ -912,7 +912,7 @@ protected class Child_0_0_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChild().ele0000Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChild().ele0000KeywordHyphenMinusGreaterThanSign();
 	}	
 }
 
@@ -937,7 +937,7 @@ protected class Child_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChild().ele001Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChild().ele001KeywordLeftParenthesis();
 	}	
 }
 
@@ -979,7 +979,7 @@ protected class Child_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChild().ele1Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prChild().ele1KeywordRightParenthesis();
 	}	
 }
 
@@ -1097,7 +1097,7 @@ protected class AbstractChildren_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prAbstractChildren().ele001Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prAbstractChildren().ele001KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -1139,7 +1139,7 @@ protected class AbstractChildren_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prAbstractChildren().ele1Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prAbstractChildren().ele1KeywordRightCurlyBracket();
 	}	
 }
 
@@ -1368,7 +1368,7 @@ protected class FirstConcrete_0_0_0_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prFirstConcrete().ele00000Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prFirstConcrete().ele00000KeywordHyphenMinusGreaterThanSign();
 	}	
 }
 
@@ -1393,7 +1393,7 @@ protected class FirstConcrete_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prFirstConcrete().ele0001Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prFirstConcrete().ele0001KeywordLeftParenthesis();
 	}	
 }
 
@@ -1462,7 +1462,7 @@ protected class FirstConcrete_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prFirstConcrete().ele1Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prFirstConcrete().ele1KeywordRightParenthesis();
 	}	
 }
 
@@ -1652,7 +1652,7 @@ protected class SecondConcrete_0_0_0_0_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prSecondConcrete().ele000000Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prSecondConcrete().ele000000KeywordHyphenMinusGreaterThanSign();
 	}	
 }
 
@@ -1690,7 +1690,7 @@ protected class SecondConcrete_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prSecondConcrete().ele0001Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prSecondConcrete().ele0001KeywordLeftParenthesis();
 	}	
 }
 
@@ -1759,7 +1759,7 @@ protected class SecondConcrete_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return PartialParserTestLanguageGrammarAccess.INSTANCE.prSecondConcrete().ele1Keyword();
+		return PartialParserTestLanguageGrammarAccess.INSTANCE.prSecondConcrete().ele1KeywordRightParenthesis();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarTestLanguageParseTreeConstructor.java
index f90e69b..1d9f00c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/ReferenceGrammarTestLanguageParseTreeConstructor.java
@@ -250,7 +250,7 @@ protected class Spielplatz_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prSpielplatz().ele001Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prSpielplatz().ele001KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -442,7 +442,7 @@ protected class Spielplatz_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prSpielplatz().ele1Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prSpielplatz().ele1KeywordRightCurlyBracket();
 	}	
 }
 
@@ -655,7 +655,7 @@ protected class Kind_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prKind().ele0001Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prKind().ele0001KeywordLeftParenthesis();
 	}	
 }
 
@@ -716,7 +716,7 @@ protected class Kind_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prKind().ele1Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prKind().ele1KeywordRightParenthesis();
 	}	
 }
 
@@ -862,7 +862,7 @@ protected class Erwachsener_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prErwachsener().ele0001Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prErwachsener().ele0001KeywordLeftParenthesis();
 	}	
 }
 
@@ -923,7 +923,7 @@ protected class Erwachsener_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prErwachsener().ele1Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prErwachsener().ele1KeywordRightParenthesis();
 	}	
 }
 
@@ -1069,7 +1069,7 @@ protected class Spielzeug_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prSpielzeug().ele0001Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prSpielzeug().ele0001KeywordLeftParenthesis();
 	}	
 }
 
@@ -1135,7 +1135,7 @@ protected class Spielzeug_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prSpielzeug().ele1Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prSpielzeug().ele1KeywordRightParenthesis();
 	}	
 }
 
@@ -1488,7 +1488,7 @@ protected class Familie_0_0_0_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prFamilie().ele0000001Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prFamilie().ele0000001KeywordLeftParenthesis();
 	}	
 }
 
@@ -1644,7 +1644,7 @@ protected class Familie_0_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prFamilie().ele010Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prFamilie().ele010KeywordComma();
 	}	
 }
 
@@ -1684,7 +1684,7 @@ protected class Familie_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prFamilie().ele1Keyword();
+		return ReferenceGrammarTestLanguageGrammarAccess.INSTANCE.prFamilie().ele1KeywordRightParenthesis();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsTestLanguageParseTreeConstructor.java
index 2334e0f..4827af6 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/SimpleExpressionsTestLanguageParseTreeConstructor.java
@@ -312,12 +312,12 @@ protected class Addition_1_0_1_Assignment_operator extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("operator");
 		if("+".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prAddition().ele10100Keyword();
+			element = SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prAddition().ele10100KeywordPlusSign();
 			return new Solution(obj);
 		}
 		if("-".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prAddition().ele10101Keyword();
+			element = SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prAddition().ele10101KeywordHyphenMinus();
 			return new Solution(obj);
 		}
 		return null;
@@ -502,12 +502,12 @@ protected class Multiplication_1_0_1_Assignment_operator extends AssignmentToken
 		IInstanceDescription obj = current.cloneAndConsume("operator");
 		if("*".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prMultiplication().ele10100Keyword();
+			element = SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prMultiplication().ele10100KeywordAsterisk();
 			return new Solution(obj);
 		}
 		if("/".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prMultiplication().ele10101Keyword();
+			element = SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prMultiplication().ele10101KeywordSolidus();
 			return new Solution(obj);
 		}
 		return null;
@@ -717,7 +717,7 @@ protected class Parens_0_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prParens().ele00Keyword();
+		return SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prParens().ele00KeywordLeftParenthesis();
 	}	
 }
 
@@ -748,7 +748,7 @@ protected class Parens_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prParens().ele1Keyword();
+		return SimpleExpressionsTestLanguageGrammarAccess.INSTANCE.prParens().ele1KeywordRightParenthesis();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TreeTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TreeTestLanguageParseTreeConstructor.java
index a9e77c2..0156572 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TreeTestLanguageParseTreeConstructor.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/parsetree/reconstr/TreeTestLanguageParseTreeConstructor.java
@@ -273,7 +273,7 @@ protected class Node_0_0_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return TreeTestLanguageGrammarAccess.INSTANCE.prNode().ele000001Keyword();
+		return TreeTestLanguageGrammarAccess.INSTANCE.prNode().ele000001KeywordLeftParenthesis();
 	}	
 }
 
@@ -310,7 +310,7 @@ protected class Node_0_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return TreeTestLanguageGrammarAccess.INSTANCE.prNode().ele0001Keyword();
+		return TreeTestLanguageGrammarAccess.INSTANCE.prNode().ele0001KeywordRightParenthesis();
 	}	
 }
 
@@ -323,7 +323,7 @@ protected class Node_0_0_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return TreeTestLanguageGrammarAccess.INSTANCE.prNode().ele001Keyword();
+		return TreeTestLanguageGrammarAccess.INSTANCE.prNode().ele001KeywordLeftCurlyBracket();
 	}	
 }
 
@@ -365,7 +365,7 @@ protected class Node_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return TreeTestLanguageGrammarAccess.INSTANCE.prNode().ele1Keyword();
+		return TreeTestLanguageGrammarAccess.INSTANCE.prNode().ele1KeywordRightCurlyBracketSemicolon();
 	}	
 }
 
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java
index f66a459..ea6236f 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ActionTestLanguageGrammarAccess.java
@@ -11,102 +11,72 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class ActionTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class ModelElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentChildren;
-		private RuleCall c0ParserRuleCallElement;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Assignment cAssignmentChildren = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallElement = (RuleCall)cAssignmentChildren.eContents().get(0);
 		
 		// Model : ( children += Element ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( children += Element ) *
-		public Assignment eleAssignmentChildren() {
-			return (cAssignmentChildren != null) ? cAssignmentChildren : (cAssignmentChildren = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentChildren() { return cAssignmentChildren; }
 
 		// Element
-		public RuleCall ele0ParserRuleCallElement() {
-			return (c0ParserRuleCallElement != null) ? c0ParserRuleCallElement : (c0ParserRuleCallElement = (RuleCall)eleAssignmentChildren().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallElement() { return c0ParserRuleCallElement; }
 	}
 
 	public class ElementElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private RuleCall c0ParserRuleCallItem;
-		private Group c1Group;
-		private Action c10ActionItemitems;
-		private Assignment c11AssignmentItems;
-		private RuleCall c110ParserRuleCallItem;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallItem = (RuleCall)cGroup.eContents().get(0);
+		private final Group c1Group = (Group)cGroup.eContents().get(1);
+		private final Action c10ActionItemitems = (Action)c1Group.eContents().get(0);
+		private final Assignment c11AssignmentItems = (Assignment)c1Group.eContents().get(1);
+		private final RuleCall c110ParserRuleCallItem = (RuleCall)c11AssignmentItems.eContents().get(0);
 		
 		// Element returns Type : Item ( { current = Item . items += current } items += Item ) ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// Item ( { current = Item . items += current } items += Item )
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// Item
-		public RuleCall ele0ParserRuleCallItem() {
-			return (c0ParserRuleCallItem != null) ? c0ParserRuleCallItem : (c0ParserRuleCallItem = (RuleCall)eleGroup().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallItem() { return c0ParserRuleCallItem; }
 
 		// { current = Item . items += current } items += Item
-		public Group ele1Group() {
-			return (c1Group != null) ? c1Group : (c1Group = (Group)eleGroup().eContents().get(1)); 
-		}
+		public Group ele1Group() { return c1Group; }
 
 		// { current = Item . items += current }
-		public Action ele10ActionItemitems() {
-			return (c10ActionItemitems != null) ? c10ActionItemitems : (c10ActionItemitems = (Action)ele1Group().eContents().get(0)); 
-		}
+		public Action ele10ActionItemitems() { return c10ActionItemitems; }
 
 		// items += Item
-		public Assignment ele11AssignmentItems() {
-			return (c11AssignmentItems != null) ? c11AssignmentItems : (c11AssignmentItems = (Assignment)ele1Group().eContents().get(1)); 
-		}
+		public Assignment ele11AssignmentItems() { return c11AssignmentItems; }
 
 		// Item
-		public RuleCall ele110ParserRuleCallItem() {
-			return (c110ParserRuleCallItem != null) ? c110ParserRuleCallItem : (c110ParserRuleCallItem = (RuleCall)ele11AssignmentItems().eContents().get(0)); 
-		}
+		public RuleCall ele110ParserRuleCallItem() { return c110ParserRuleCallItem; }
 	}
 
 	public class ItemElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Action c0ActionThingcontent;
-		private Assignment c1AssignmentName;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Action c0ActionThingcontent = (Action)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
 		
 		// Item returns Type : { current = Thing . content = current } name = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// { current = Thing . content = current } name = ID
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// { current = Thing . content = current }
-		public Action ele0ActionThingcontent() {
-			return (c0ActionThingcontent != null) ? c0ActionThingcontent : (c0ActionThingcontent = (Action)eleGroup().eContents().get(0)); 
-		}
+		public Action ele0ActionThingcontent() { return c0ActionThingcontent; }
 
 		// name = ID
-		public Assignment ele1AssignmentName() {
-			return (c1AssignmentName != null) ? c1AssignmentName : (c1AssignmentName = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentName() { return c1AssignmentName; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 	
 	public final static ActionTestLanguageGrammarAccess INSTANCE = new ActionTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java
index ecfd7b9..c6ead6c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ContentAssistTestLanguageGrammarAccess.java
@@ -11,246 +11,170 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class ContentAssistTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class StartElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Keyword c00KeywordAbstractRules;
-		private Assignment c01AssignmentRules;
-		private RuleCall c010ParserRuleCallAbstractRule;
-		private Keyword c1KeywordEnd;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Keyword c00KeywordAbstractRules = (Keyword)c0Group.eContents().get(0);
+		private final Assignment c01AssignmentRules = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallAbstractRule = (RuleCall)c01AssignmentRules.eContents().get(0);
+		private final Keyword c1KeywordEnd = (Keyword)cGroup.eContents().get(1);
 		
 		// Start : 'abstract rules' ( rules += AbstractRule ) + 'end' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'abstract rules' ( rules += AbstractRule ) + 'end'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'abstract rules' ( rules += AbstractRule ) +
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'abstract rules'
-		public Keyword ele00KeywordAbstractRules() {
-			return (c00KeywordAbstractRules != null) ? c00KeywordAbstractRules : (c00KeywordAbstractRules = (Keyword)ele0Group().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordAbstractRules() { return c00KeywordAbstractRules; }
 
 		// ( rules += AbstractRule ) +
-		public Assignment ele01AssignmentRules() {
-			return (c01AssignmentRules != null) ? c01AssignmentRules : (c01AssignmentRules = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentRules() { return c01AssignmentRules; }
 
 		// AbstractRule
-		public RuleCall ele010ParserRuleCallAbstractRule() {
-			return (c010ParserRuleCallAbstractRule != null) ? c010ParserRuleCallAbstractRule : (c010ParserRuleCallAbstractRule = (RuleCall)ele01AssignmentRules().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallAbstractRule() { return c010ParserRuleCallAbstractRule; }
 
 		// 'end'
-		public Keyword ele1KeywordEnd() {
-			return (c1KeywordEnd != null) ? c1KeywordEnd : (c1KeywordEnd = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordEnd() { return c1KeywordEnd; }
 	}
 
 	public class AbstractRuleElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private RuleCall c0ParserRuleCallFirstAbstractRuleChild;
-		private RuleCall c1ParserRuleCallSecondAbstractRuleChild;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallFirstAbstractRuleChild = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall c1ParserRuleCallSecondAbstractRuleChild = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// AbstractRule : FirstAbstractRuleChild | SecondAbstractRuleChild ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// FirstAbstractRuleChild | SecondAbstractRuleChild
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// FirstAbstractRuleChild
-		public RuleCall ele0ParserRuleCallFirstAbstractRuleChild() {
-			return (c0ParserRuleCallFirstAbstractRuleChild != null) ? c0ParserRuleCallFirstAbstractRuleChild : (c0ParserRuleCallFirstAbstractRuleChild = (RuleCall)eleAlternatives().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallFirstAbstractRuleChild() { return c0ParserRuleCallFirstAbstractRuleChild; }
 
 		// SecondAbstractRuleChild
-		public RuleCall ele1ParserRuleCallSecondAbstractRuleChild() {
-			return (c1ParserRuleCallSecondAbstractRuleChild != null) ? c1ParserRuleCallSecondAbstractRuleChild : (c1ParserRuleCallSecondAbstractRuleChild = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallSecondAbstractRuleChild() { return c1ParserRuleCallSecondAbstractRuleChild; }
 	}
 
 	public class FirstAbstractRuleChildElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Assignment c0000AssignmentName;
-		private RuleCall c00000LexerRuleCallID;
-		private Keyword c0001Keyword;
-		private Assignment c001AssignmentElements;
-		private RuleCall c0010ParserRuleCallAbstractRule;
-		private Keyword c01Keyword;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Assignment c0000AssignmentName = (Assignment)c000Group.eContents().get(0);
+		private final RuleCall c00000LexerRuleCallID = (RuleCall)c0000AssignmentName.eContents().get(0);
+		private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentElements = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010ParserRuleCallAbstractRule = (RuleCall)c001AssignmentElements.eContents().get(0);
+		private final Keyword c01KeywordRightParenthesis = (Keyword)c0Group.eContents().get(1);
+		private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1);
 		
 		// FirstAbstractRuleChild : name = ID '(' ( elements += AbstractRule ) + ')' ';' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID '(' ( elements += AbstractRule ) + ')' ';'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// name = ID '(' ( elements += AbstractRule ) + ')'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// name = ID '(' ( elements += AbstractRule ) +
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// name = ID '('
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// name = ID
-		public Assignment ele0000AssignmentName() {
-			return (c0000AssignmentName != null) ? c0000AssignmentName : (c0000AssignmentName = (Assignment)ele000Group().eContents().get(0)); 
-		}
+		public Assignment ele0000AssignmentName() { return c0000AssignmentName; }
 
 		// ID
-		public RuleCall ele00000LexerRuleCallID() {
-			return (c00000LexerRuleCallID != null) ? c00000LexerRuleCallID : (c00000LexerRuleCallID = (RuleCall)ele0000AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00000LexerRuleCallID() { return c00000LexerRuleCallID; }
 
 		// '('
-		public Keyword ele0001Keyword() {
-			return (c0001Keyword != null) ? c0001Keyword : (c0001Keyword = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordLeftParenthesis() { return c0001KeywordLeftParenthesis; }
 
 		// ( elements += AbstractRule ) +
-		public Assignment ele001AssignmentElements() {
-			return (c001AssignmentElements != null) ? c001AssignmentElements : (c001AssignmentElements = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentElements() { return c001AssignmentElements; }
 
 		// AbstractRule
-		public RuleCall ele0010ParserRuleCallAbstractRule() {
-			return (c0010ParserRuleCallAbstractRule != null) ? c0010ParserRuleCallAbstractRule : (c0010ParserRuleCallAbstractRule = (RuleCall)ele001AssignmentElements().eContents().get(0)); 
-		}
+		public RuleCall ele0010ParserRuleCallAbstractRule() { return c0010ParserRuleCallAbstractRule; }
 
 		// ')'
-		public Keyword ele01Keyword() {
-			return (c01Keyword != null) ? c01Keyword : (c01Keyword = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordRightParenthesis() { return c01KeywordRightParenthesis; }
 
 		// ';'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; }
 	}
 
 	public class SecondAbstractRuleChildElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Assignment c0000AssignmentName;
-		private RuleCall c00000LexerRuleCallID;
-		private Keyword c0001KeywordRule;
-		private Keyword c001Keyword;
-		private Assignment c01AssignmentRule;
-		private RuleCall c010ParserRuleCallAbstractRuleCall;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Assignment c0000AssignmentName = (Assignment)c000Group.eContents().get(0);
+		private final RuleCall c00000LexerRuleCallID = (RuleCall)c0000AssignmentName.eContents().get(0);
+		private final Keyword c0001KeywordRule = (Keyword)c000Group.eContents().get(1);
+		private final Keyword c001KeywordColon = (Keyword)c00Group.eContents().get(1);
+		private final Assignment c01AssignmentRule = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallAbstractRuleCall = (RuleCall)c01AssignmentRule.eContents().get(0);
+		private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1);
 		
 		// SecondAbstractRuleChild : name = ID 'rule' ':' rule = AbstractRuleCall ';' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID 'rule' ':' rule = AbstractRuleCall ';'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// name = ID 'rule' ':' rule = AbstractRuleCall
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// name = ID 'rule' ':'
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// name = ID 'rule'
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// name = ID
-		public Assignment ele0000AssignmentName() {
-			return (c0000AssignmentName != null) ? c0000AssignmentName : (c0000AssignmentName = (Assignment)ele000Group().eContents().get(0)); 
-		}
+		public Assignment ele0000AssignmentName() { return c0000AssignmentName; }
 
 		// ID
-		public RuleCall ele00000LexerRuleCallID() {
-			return (c00000LexerRuleCallID != null) ? c00000LexerRuleCallID : (c00000LexerRuleCallID = (RuleCall)ele0000AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00000LexerRuleCallID() { return c00000LexerRuleCallID; }
 
 		// 'rule'
-		public Keyword ele0001KeywordRule() {
-			return (c0001KeywordRule != null) ? c0001KeywordRule : (c0001KeywordRule = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordRule() { return c0001KeywordRule; }
 
 		// ':'
-		public Keyword ele001Keyword() {
-			return (c001Keyword != null) ? c001Keyword : (c001Keyword = (Keyword)ele00Group().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordColon() { return c001KeywordColon; }
 
 		// rule = AbstractRuleCall
-		public Assignment ele01AssignmentRule() {
-			return (c01AssignmentRule != null) ? c01AssignmentRule : (c01AssignmentRule = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentRule() { return c01AssignmentRule; }
 
 		// AbstractRuleCall
-		public RuleCall ele010ParserRuleCallAbstractRuleCall() {
-			return (c010ParserRuleCallAbstractRuleCall != null) ? c010ParserRuleCallAbstractRuleCall : (c010ParserRuleCallAbstractRuleCall = (RuleCall)ele01AssignmentRule().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallAbstractRuleCall() { return c010ParserRuleCallAbstractRuleCall; }
 
 		// ';'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; }
 	}
 
 	public class AbstractRuleCallElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentRule;
-		private CrossReference c0CrossReferenceAbstractRule;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(5);
+		private final Assignment cAssignmentRule = (Assignment)rule.eContents().get(1);
+		private final CrossReference c0CrossReferenceAbstractRule = (CrossReference)cAssignmentRule.eContents().get(0);
 		
 		// AbstractRuleCall : rule = [ AbstractRule ] ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(5)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// rule = [ AbstractRule ]
-		public Assignment eleAssignmentRule() {
-			return (cAssignmentRule != null) ? cAssignmentRule : (cAssignmentRule = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentRule() { return cAssignmentRule; }
 
 		// [ AbstractRule ]
-		public CrossReference ele0CrossReferenceAbstractRule() {
-			return (c0CrossReferenceAbstractRule != null) ? c0CrossReferenceAbstractRule : (c0CrossReferenceAbstractRule = (CrossReference)eleAssignmentRule().eContents().get(0)); 
-		}
+		public CrossReference ele0CrossReferenceAbstractRule() { return c0CrossReferenceAbstractRule; }
 	}
 	
 	public final static ContentAssistTestLanguageGrammarAccess INSTANCE = new ContentAssistTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java
index f27efe2..9d2ed3c 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/FowlerDslTestLanguageGrammarAccess.java
@@ -11,372 +11,254 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class FowlerDslTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class StatemachineElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Group c00000Group;
-		private Keyword c000000KeywordEvents;
-		private Assignment c000001AssignmentEvents;
-		private RuleCall c0000010ParserRuleCallEvent;
-		private Keyword c00001KeywordEnd;
-		private Keyword c0001KeywordCommands;
-		private Assignment c001AssignmentCommands;
-		private RuleCall c0010ParserRuleCallCommand;
-		private Keyword c01KeywordEnd;
-		private Assignment c1AssignmentStates;
-		private RuleCall c10ParserRuleCallState;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Group c00000Group = (Group)c0000Group.eContents().get(0);
+		private final Keyword c000000KeywordEvents = (Keyword)c00000Group.eContents().get(0);
+		private final Assignment c000001AssignmentEvents = (Assignment)c00000Group.eContents().get(1);
+		private final RuleCall c0000010ParserRuleCallEvent = (RuleCall)c000001AssignmentEvents.eContents().get(0);
+		private final Keyword c00001KeywordEnd = (Keyword)c0000Group.eContents().get(1);
+		private final Keyword c0001KeywordCommands = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentCommands = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010ParserRuleCallCommand = (RuleCall)c001AssignmentCommands.eContents().get(0);
+		private final Keyword c01KeywordEnd = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentStates = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallState = (RuleCall)c1AssignmentStates.eContents().get(0);
 		
 		// Statemachine : 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end' ( states += State ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end' ( states += State ) *
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) * 'end'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'events' ( events += Event ) * 'end' 'commands' ( commands += Command ) *
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'events' ( events += Event ) * 'end' 'commands'
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'events' ( events += Event ) * 'end'
-		public Group ele0000Group() {
-			return (c0000Group != null) ? c0000Group : (c0000Group = (Group)ele000Group().eContents().get(0)); 
-		}
+		public Group ele0000Group() { return c0000Group; }
 
 		// 'events' ( events += Event ) *
-		public Group ele00000Group() {
-			return (c00000Group != null) ? c00000Group : (c00000Group = (Group)ele0000Group().eContents().get(0)); 
-		}
+		public Group ele00000Group() { return c00000Group; }
 
 		// 'events'
-		public Keyword ele000000KeywordEvents() {
-			return (c000000KeywordEvents != null) ? c000000KeywordEvents : (c000000KeywordEvents = (Keyword)ele00000Group().eContents().get(0)); 
-		}
+		public Keyword ele000000KeywordEvents() { return c000000KeywordEvents; }
 
 		// ( events += Event ) *
-		public Assignment ele000001AssignmentEvents() {
-			return (c000001AssignmentEvents != null) ? c000001AssignmentEvents : (c000001AssignmentEvents = (Assignment)ele00000Group().eContents().get(1)); 
-		}
+		public Assignment ele000001AssignmentEvents() { return c000001AssignmentEvents; }
 
 		// Event
-		public RuleCall ele0000010ParserRuleCallEvent() {
-			return (c0000010ParserRuleCallEvent != null) ? c0000010ParserRuleCallEvent : (c0000010ParserRuleCallEvent = (RuleCall)ele000001AssignmentEvents().eContents().get(0)); 
-		}
+		public RuleCall ele0000010ParserRuleCallEvent() { return c0000010ParserRuleCallEvent; }
 
 		// 'end'
-		public Keyword ele00001KeywordEnd() {
-			return (c00001KeywordEnd != null) ? c00001KeywordEnd : (c00001KeywordEnd = (Keyword)ele0000Group().eContents().get(1)); 
-		}
+		public Keyword ele00001KeywordEnd() { return c00001KeywordEnd; }
 
 		// 'commands'
-		public Keyword ele0001KeywordCommands() {
-			return (c0001KeywordCommands != null) ? c0001KeywordCommands : (c0001KeywordCommands = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordCommands() { return c0001KeywordCommands; }
 
 		// ( commands += Command ) *
-		public Assignment ele001AssignmentCommands() {
-			return (c001AssignmentCommands != null) ? c001AssignmentCommands : (c001AssignmentCommands = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentCommands() { return c001AssignmentCommands; }
 
 		// Command
-		public RuleCall ele0010ParserRuleCallCommand() {
-			return (c0010ParserRuleCallCommand != null) ? c0010ParserRuleCallCommand : (c0010ParserRuleCallCommand = (RuleCall)ele001AssignmentCommands().eContents().get(0)); 
-		}
+		public RuleCall ele0010ParserRuleCallCommand() { return c0010ParserRuleCallCommand; }
 
 		// 'end'
-		public Keyword ele01KeywordEnd() {
-			return (c01KeywordEnd != null) ? c01KeywordEnd : (c01KeywordEnd = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordEnd() { return c01KeywordEnd; }
 
 		// ( states += State ) *
-		public Assignment ele1AssignmentStates() {
-			return (c1AssignmentStates != null) ? c1AssignmentStates : (c1AssignmentStates = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentStates() { return c1AssignmentStates; }
 
 		// State
-		public RuleCall ele10ParserRuleCallState() {
-			return (c10ParserRuleCallState != null) ? c10ParserRuleCallState : (c10ParserRuleCallState = (RuleCall)ele1AssignmentStates().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallState() { return c10ParserRuleCallState; }
 	}
 
 	public class EventElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Assignment c00AssignmentResetting;
-		private Keyword c000KeywordResetting;
-		private Assignment c01AssignmentName;
-		private RuleCall c010LexerRuleCallID;
-		private Assignment c1AssignmentCode;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Assignment c00AssignmentResetting = (Assignment)c0Group.eContents().get(0);
+		private final Keyword c000KeywordResetting = (Keyword)c00AssignmentResetting.eContents().get(0);
+		private final Assignment c01AssignmentName = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010LexerRuleCallID = (RuleCall)c01AssignmentName.eContents().get(0);
+		private final Assignment c1AssignmentCode = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentCode.eContents().get(0);
 		
 		// Event : ( resetting ?= 'resetting' ) ? name = ID code = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( resetting ?= 'resetting' ) ? name = ID code = ID
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// ( resetting ?= 'resetting' ) ? name = ID
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// ( resetting ?= 'resetting' ) ?
-		public Assignment ele00AssignmentResetting() {
-			return (c00AssignmentResetting != null) ? c00AssignmentResetting : (c00AssignmentResetting = (Assignment)ele0Group().eContents().get(0)); 
-		}
+		public Assignment ele00AssignmentResetting() { return c00AssignmentResetting; }
 
 		// 'resetting'
-		public Keyword ele000KeywordResetting() {
-			return (c000KeywordResetting != null) ? c000KeywordResetting : (c000KeywordResetting = (Keyword)ele00AssignmentResetting().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordResetting() { return c000KeywordResetting; }
 
 		// name = ID
-		public Assignment ele01AssignmentName() {
-			return (c01AssignmentName != null) ? c01AssignmentName : (c01AssignmentName = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentName() { return c01AssignmentName; }
 
 		// ID
-		public RuleCall ele010LexerRuleCallID() {
-			return (c010LexerRuleCallID != null) ? c010LexerRuleCallID : (c010LexerRuleCallID = (RuleCall)ele01AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele010LexerRuleCallID() { return c010LexerRuleCallID; }
 
 		// code = ID
-		public Assignment ele1AssignmentCode() {
-			return (c1AssignmentCode != null) ? c1AssignmentCode : (c1AssignmentCode = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentCode() { return c1AssignmentCode; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentCode().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 
 	public class CommandElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Assignment c0AssignmentName;
-		private RuleCall c00LexerRuleCallID;
-		private Assignment c1AssignmentCode;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Assignment c0AssignmentName = (Assignment)cGroup.eContents().get(0);
+		private final RuleCall c00LexerRuleCallID = (RuleCall)c0AssignmentName.eContents().get(0);
+		private final Assignment c1AssignmentCode = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentCode.eContents().get(0);
 		
 		// Command : name = ID code = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID code = ID
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// name = ID
-		public Assignment ele0AssignmentName() {
-			return (c0AssignmentName != null) ? c0AssignmentName : (c0AssignmentName = (Assignment)eleGroup().eContents().get(0)); 
-		}
+		public Assignment ele0AssignmentName() { return c0AssignmentName; }
 
 		// ID
-		public RuleCall ele00LexerRuleCallID() {
-			return (c00LexerRuleCallID != null) ? c00LexerRuleCallID : (c00LexerRuleCallID = (RuleCall)ele0AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00LexerRuleCallID() { return c00LexerRuleCallID; }
 
 		// code = ID
-		public Assignment ele1AssignmentCode() {
-			return (c1AssignmentCode != null) ? c1AssignmentCode : (c1AssignmentCode = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentCode() { return c1AssignmentCode; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentCode().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 
 	public class StateElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000KeywordState;
-		private Assignment c0001AssignmentName;
-		private RuleCall c00010LexerRuleCallID;
-		private Group c001Group;
-		private Group c0010Group;
-		private Group c00100Group;
-		private Keyword c001000KeywordActions;
-		private Keyword c001001Keyword;
-		private Assignment c00101AssignmentActions;
-		private CrossReference c001010CrossReferenceCommand;
-		private Keyword c0011Keyword;
-		private Assignment c01AssignmentTransitions;
-		private RuleCall c010ParserRuleCallTransition;
-		private Keyword c1KeywordEnd;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordState = (Keyword)c000Group.eContents().get(0);
+		private final Assignment c0001AssignmentName = (Assignment)c000Group.eContents().get(1);
+		private final RuleCall c00010LexerRuleCallID = (RuleCall)c0001AssignmentName.eContents().get(0);
+		private final Group c001Group = (Group)c00Group.eContents().get(1);
+		private final Group c0010Group = (Group)c001Group.eContents().get(0);
+		private final Group c00100Group = (Group)c0010Group.eContents().get(0);
+		private final Keyword c001000KeywordActions = (Keyword)c00100Group.eContents().get(0);
+		private final Keyword c001001KeywordLeftCurlyBracket = (Keyword)c00100Group.eContents().get(1);
+		private final Assignment c00101AssignmentActions = (Assignment)c0010Group.eContents().get(1);
+		private final CrossReference c001010CrossReferenceCommand = (CrossReference)c00101AssignmentActions.eContents().get(0);
+		private final Keyword c0011KeywordRightCurlyBracket = (Keyword)c001Group.eContents().get(1);
+		private final Assignment c01AssignmentTransitions = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallTransition = (RuleCall)c01AssignmentTransitions.eContents().get(0);
+		private final Keyword c1KeywordEnd = (Keyword)cGroup.eContents().get(1);
 		
 		// State : 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) * 'end'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ? ( transitions += Transition ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'state' name = ID ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'state' name = ID
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'state'
-		public Keyword ele0000KeywordState() {
-			return (c0000KeywordState != null) ? c0000KeywordState : (c0000KeywordState = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordState() { return c0000KeywordState; }
 
 		// name = ID
-		public Assignment ele0001AssignmentName() {
-			return (c0001AssignmentName != null) ? c0001AssignmentName : (c0001AssignmentName = (Assignment)ele000Group().eContents().get(1)); 
-		}
+		public Assignment ele0001AssignmentName() { return c0001AssignmentName; }
 
 		// ID
-		public RuleCall ele00010LexerRuleCallID() {
-			return (c00010LexerRuleCallID != null) ? c00010LexerRuleCallID : (c00010LexerRuleCallID = (RuleCall)ele0001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00010LexerRuleCallID() { return c00010LexerRuleCallID; }
 
 		// ( 'actions' '{' ( actions += [ Command ] ) + '}' ) ?
-		public Group ele001Group() {
-			return (c001Group != null) ? c001Group : (c001Group = (Group)ele00Group().eContents().get(1)); 
-		}
+		public Group ele001Group() { return c001Group; }
 
 		// 'actions' '{' ( actions += [ Command ] ) +
-		public Group ele0010Group() {
-			return (c0010Group != null) ? c0010Group : (c0010Group = (Group)ele001Group().eContents().get(0)); 
-		}
+		public Group ele0010Group() { return c0010Group; }
 
 		// 'actions' '{'
-		public Group ele00100Group() {
-			return (c00100Group != null) ? c00100Group : (c00100Group = (Group)ele0010Group().eContents().get(0)); 
-		}
+		public Group ele00100Group() { return c00100Group; }
 
 		// 'actions'
-		public Keyword ele001000KeywordActions() {
-			return (c001000KeywordActions != null) ? c001000KeywordActions : (c001000KeywordActions = (Keyword)ele00100Group().eContents().get(0)); 
-		}
+		public Keyword ele001000KeywordActions() { return c001000KeywordActions; }
 
 		// '{'
-		public Keyword ele001001Keyword() {
-			return (c001001Keyword != null) ? c001001Keyword : (c001001Keyword = (Keyword)ele00100Group().eContents().get(1)); 
-		}
+		public Keyword ele001001KeywordLeftCurlyBracket() { return c001001KeywordLeftCurlyBracket; }
 
 		// ( actions += [ Command ] ) +
-		public Assignment ele00101AssignmentActions() {
-			return (c00101AssignmentActions != null) ? c00101AssignmentActions : (c00101AssignmentActions = (Assignment)ele0010Group().eContents().get(1)); 
-		}
+		public Assignment ele00101AssignmentActions() { return c00101AssignmentActions; }
 
 		// [ Command ]
-		public CrossReference ele001010CrossReferenceCommand() {
-			return (c001010CrossReferenceCommand != null) ? c001010CrossReferenceCommand : (c001010CrossReferenceCommand = (CrossReference)ele00101AssignmentActions().eContents().get(0)); 
-		}
+		public CrossReference ele001010CrossReferenceCommand() { return c001010CrossReferenceCommand; }
 
 		// '}'
-		public Keyword ele0011Keyword() {
-			return (c0011Keyword != null) ? c0011Keyword : (c0011Keyword = (Keyword)ele001Group().eContents().get(1)); 
-		}
+		public Keyword ele0011KeywordRightCurlyBracket() { return c0011KeywordRightCurlyBracket; }
 
 		// ( transitions += Transition ) *
-		public Assignment ele01AssignmentTransitions() {
-			return (c01AssignmentTransitions != null) ? c01AssignmentTransitions : (c01AssignmentTransitions = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentTransitions() { return c01AssignmentTransitions; }
 
 		// Transition
-		public RuleCall ele010ParserRuleCallTransition() {
-			return (c010ParserRuleCallTransition != null) ? c010ParserRuleCallTransition : (c010ParserRuleCallTransition = (RuleCall)ele01AssignmentTransitions().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallTransition() { return c010ParserRuleCallTransition; }
 
 		// 'end'
-		public Keyword ele1KeywordEnd() {
-			return (c1KeywordEnd != null) ? c1KeywordEnd : (c1KeywordEnd = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordEnd() { return c1KeywordEnd; }
 	}
 
 	public class TransitionElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Assignment c00AssignmentEvent;
-		private CrossReference c000CrossReferenceEvent;
-		private Keyword c01Keyword;
-		private Assignment c1AssignmentState;
-		private CrossReference c10CrossReferenceState;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(5);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Assignment c00AssignmentEvent = (Assignment)c0Group.eContents().get(0);
+		private final CrossReference c000CrossReferenceEvent = (CrossReference)c00AssignmentEvent.eContents().get(0);
+		private final Keyword c01KeywordEqualsSignGreaterThanSign = (Keyword)c0Group.eContents().get(1);
+		private final Assignment c1AssignmentState = (Assignment)cGroup.eContents().get(1);
+		private final CrossReference c10CrossReferenceState = (CrossReference)c1AssignmentState.eContents().get(0);
 		
 		// Transition : event = [ Event ] '=>' state = [ State ] ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(5)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// event = [ Event ] '=>' state = [ State ]
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// event = [ Event ] '=>'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// event = [ Event ]
-		public Assignment ele00AssignmentEvent() {
-			return (c00AssignmentEvent != null) ? c00AssignmentEvent : (c00AssignmentEvent = (Assignment)ele0Group().eContents().get(0)); 
-		}
+		public Assignment ele00AssignmentEvent() { return c00AssignmentEvent; }
 
 		// [ Event ]
-		public CrossReference ele000CrossReferenceEvent() {
-			return (c000CrossReferenceEvent != null) ? c000CrossReferenceEvent : (c000CrossReferenceEvent = (CrossReference)ele00AssignmentEvent().eContents().get(0)); 
-		}
+		public CrossReference ele000CrossReferenceEvent() { return c000CrossReferenceEvent; }
 
 		// '=>'
-		public Keyword ele01Keyword() {
-			return (c01Keyword != null) ? c01Keyword : (c01Keyword = (Keyword)ele0Group().eContents().get(1)); 
-		}
+		public Keyword ele01KeywordEqualsSignGreaterThanSign() { return c01KeywordEqualsSignGreaterThanSign; }
 
 		// state = [ State ]
-		public Assignment ele1AssignmentState() {
-			return (c1AssignmentState != null) ? c1AssignmentState : (c1AssignmentState = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentState() { return c1AssignmentState; }
 
 		// [ State ]
-		public CrossReference ele10CrossReferenceState() {
-			return (c10CrossReferenceState != null) ? c10CrossReferenceState : (c10CrossReferenceState = (CrossReference)ele1AssignmentState().eContents().get(0)); 
-		}
+		public CrossReference ele10CrossReferenceState() { return c10CrossReferenceState; }
 	}
 	
 	public final static FowlerDslTestLanguageGrammarAccess INSTANCE = new FowlerDslTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java
index ddaae81..9431469 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LexerTestLanguageGrammarAccess.java
@@ -11,63 +11,45 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class LexerTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class ModelElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentChildren;
-		private RuleCall c0ParserRuleCallElement;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Assignment cAssignmentChildren = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallElement = (RuleCall)cAssignmentChildren.eContents().get(0);
 		
 		// Model : ( children += Element ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( children += Element ) *
-		public Assignment eleAssignmentChildren() {
-			return (cAssignmentChildren != null) ? cAssignmentChildren : (cAssignmentChildren = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentChildren() { return cAssignmentChildren; }
 
 		// Element
-		public RuleCall ele0ParserRuleCallElement() {
-			return (c0ParserRuleCallElement != null) ? c0ParserRuleCallElement : (c0ParserRuleCallElement = (RuleCall)eleAssignmentChildren().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallElement() { return c0ParserRuleCallElement; }
 	}
 
 	public class ElementElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Assignment c0AssignmentName;
-		private RuleCall c00LexerRuleCallID;
-		private Assignment c1AssignmentH;
-		private RuleCall c10LexerRuleCallSTRING;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Assignment c0AssignmentName = (Assignment)cGroup.eContents().get(0);
+		private final RuleCall c00LexerRuleCallID = (RuleCall)c0AssignmentName.eContents().get(0);
+		private final Assignment c1AssignmentH = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallSTRING = (RuleCall)c1AssignmentH.eContents().get(0);
 		
 		// Element : name = ID h = STRING ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID h = STRING
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// name = ID
-		public Assignment ele0AssignmentName() {
-			return (c0AssignmentName != null) ? c0AssignmentName : (c0AssignmentName = (Assignment)eleGroup().eContents().get(0)); 
-		}
+		public Assignment ele0AssignmentName() { return c0AssignmentName; }
 
 		// ID
-		public RuleCall ele00LexerRuleCallID() {
-			return (c00LexerRuleCallID != null) ? c00LexerRuleCallID : (c00LexerRuleCallID = (RuleCall)ele0AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00LexerRuleCallID() { return c00LexerRuleCallID; }
 
 		// h = STRING
-		public Assignment ele1AssignmentH() {
-			return (c1AssignmentH != null) ? c1AssignmentH : (c1AssignmentH = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentH() { return c1AssignmentH; }
 
 		// STRING
-		public RuleCall ele10LexerRuleCallSTRING() {
-			return (c10LexerRuleCallSTRING != null) ? c10LexerRuleCallSTRING : (c10LexerRuleCallSTRING = (RuleCall)ele1AssignmentH().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallSTRING() { return c10LexerRuleCallSTRING; }
 	}
 	
 	public final static LexerTestLanguageGrammarAccess INSTANCE = new LexerTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java
index 4de9f73..3fe40cb 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/LookaheadTestLanguageGrammarAccess.java
@@ -11,318 +11,220 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class LookaheadTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class EntryElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentContents;
-		private RuleCall c0ParserRuleCallAlts;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Assignment cAssignmentContents = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallAlts = (RuleCall)cAssignmentContents.eContents().get(0);
 		
 		// Entry : ( contents += Alts ) * ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( contents += Alts ) *
-		public Assignment eleAssignmentContents() {
-			return (cAssignmentContents != null) ? cAssignmentContents : (cAssignmentContents = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentContents() { return cAssignmentContents; }
 
 		// Alts
-		public RuleCall ele0ParserRuleCallAlts() {
-			return (c0ParserRuleCallAlts != null) ? c0ParserRuleCallAlts : (c0ParserRuleCallAlts = (RuleCall)eleAssignmentContents().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallAlts() { return c0ParserRuleCallAlts; }
 	}
 
 	public class AltsElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private Alternatives c0Alternatives;
-		private RuleCall c00ParserRuleCallLookAhead0;
-		private RuleCall c01ParserRuleCallLookAhead1;
-		private RuleCall c1ParserRuleCallLookAhead3;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final Alternatives c0Alternatives = (Alternatives)cAlternatives.eContents().get(0);
+		private final RuleCall c00ParserRuleCallLookAhead0 = (RuleCall)c0Alternatives.eContents().get(0);
+		private final RuleCall c01ParserRuleCallLookAhead1 = (RuleCall)c0Alternatives.eContents().get(1);
+		private final RuleCall c1ParserRuleCallLookAhead3 = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// Alts : LookAhead0 | LookAhead1 | LookAhead3 ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// LookAhead0 | LookAhead1 | LookAhead3
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// LookAhead0 | LookAhead1
-		public Alternatives ele0Alternatives() {
-			return (c0Alternatives != null) ? c0Alternatives : (c0Alternatives = (Alternatives)eleAlternatives().eContents().get(0)); 
-		}
+		public Alternatives ele0Alternatives() { return c0Alternatives; }
 
 		// LookAhead0
-		public RuleCall ele00ParserRuleCallLookAhead0() {
-			return (c00ParserRuleCallLookAhead0 != null) ? c00ParserRuleCallLookAhead0 : (c00ParserRuleCallLookAhead0 = (RuleCall)ele0Alternatives().eContents().get(0)); 
-		}
+		public RuleCall ele00ParserRuleCallLookAhead0() { return c00ParserRuleCallLookAhead0; }
 
 		// LookAhead1
-		public RuleCall ele01ParserRuleCallLookAhead1() {
-			return (c01ParserRuleCallLookAhead1 != null) ? c01ParserRuleCallLookAhead1 : (c01ParserRuleCallLookAhead1 = (RuleCall)ele0Alternatives().eContents().get(1)); 
-		}
+		public RuleCall ele01ParserRuleCallLookAhead1() { return c01ParserRuleCallLookAhead1; }
 
 		// LookAhead3
-		public RuleCall ele1ParserRuleCallLookAhead3() {
-			return (c1ParserRuleCallLookAhead3 != null) ? c1ParserRuleCallLookAhead3 : (c1ParserRuleCallLookAhead3 = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallLookAhead3() { return c1ParserRuleCallLookAhead3; }
 	}
 
 	public class LookAhead0Elements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Keyword c0KeywordBar;
-		private Assignment c1AssignmentX;
-		private Keyword c10KeywordA;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordBar = (Keyword)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentX = (Assignment)cGroup.eContents().get(1);
+		private final Keyword c10KeywordA = (Keyword)c1AssignmentX.eContents().get(0);
 		
 		// LookAhead0 : 'bar' x = 'a' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'bar' x = 'a'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'bar'
-		public Keyword ele0KeywordBar() {
-			return (c0KeywordBar != null) ? c0KeywordBar : (c0KeywordBar = (Keyword)eleGroup().eContents().get(0)); 
-		}
+		public Keyword ele0KeywordBar() { return c0KeywordBar; }
 
 		// x = 'a'
-		public Assignment ele1AssignmentX() {
-			return (c1AssignmentX != null) ? c1AssignmentX : (c1AssignmentX = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentX() { return c1AssignmentX; }
 
 		// 'a'
-		public Keyword ele10KeywordA() {
-			return (c10KeywordA != null) ? c10KeywordA : (c10KeywordA = (Keyword)ele1AssignmentX().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordA() { return c10KeywordA; }
 	}
 
 	public class LookAhead1Elements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordFoo;
-		private Assignment c001AssignmentY;
-		private RuleCall c0010ParserRuleCallLookAhead2;
-		private Assignment c01AssignmentX;
-		private Keyword c010KeywordB;
-		private Assignment c1AssignmentX;
-		private Keyword c10KeywordD;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordFoo = (Keyword)c00Group.eContents().get(0);
+		private final Assignment c001AssignmentY = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010ParserRuleCallLookAhead2 = (RuleCall)c001AssignmentY.eContents().get(0);
+		private final Assignment c01AssignmentX = (Assignment)c0Group.eContents().get(1);
+		private final Keyword c010KeywordB = (Keyword)c01AssignmentX.eContents().get(0);
+		private final Assignment c1AssignmentX = (Assignment)cGroup.eContents().get(1);
+		private final Keyword c10KeywordD = (Keyword)c1AssignmentX.eContents().get(0);
 		
 		// LookAhead1 : 'foo' y = LookAhead2 x = 'b' x = 'd' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'foo' y = LookAhead2 x = 'b' x = 'd'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'foo' y = LookAhead2 x = 'b'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'foo' y = LookAhead2
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'foo'
-		public Keyword ele000KeywordFoo() {
-			return (c000KeywordFoo != null) ? c000KeywordFoo : (c000KeywordFoo = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordFoo() { return c000KeywordFoo; }
 
 		// y = LookAhead2
-		public Assignment ele001AssignmentY() {
-			return (c001AssignmentY != null) ? c001AssignmentY : (c001AssignmentY = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentY() { return c001AssignmentY; }
 
 		// LookAhead2
-		public RuleCall ele0010ParserRuleCallLookAhead2() {
-			return (c0010ParserRuleCallLookAhead2 != null) ? c0010ParserRuleCallLookAhead2 : (c0010ParserRuleCallLookAhead2 = (RuleCall)ele001AssignmentY().eContents().get(0)); 
-		}
+		public RuleCall ele0010ParserRuleCallLookAhead2() { return c0010ParserRuleCallLookAhead2; }
 
 		// x = 'b'
-		public Assignment ele01AssignmentX() {
-			return (c01AssignmentX != null) ? c01AssignmentX : (c01AssignmentX = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentX() { return c01AssignmentX; }
 
 		// 'b'
-		public Keyword ele010KeywordB() {
-			return (c010KeywordB != null) ? c010KeywordB : (c010KeywordB = (Keyword)ele01AssignmentX().eContents().get(0)); 
-		}
+		public Keyword ele010KeywordB() { return c010KeywordB; }
 
 		// x = 'd'
-		public Assignment ele1AssignmentX() {
-			return (c1AssignmentX != null) ? c1AssignmentX : (c1AssignmentX = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentX() { return c1AssignmentX; }
 
 		// 'd'
-		public Keyword ele10KeywordD() {
-			return (c10KeywordD != null) ? c10KeywordD : (c10KeywordD = (Keyword)ele1AssignmentX().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordD() { return c10KeywordD; }
 	}
 
 	public class LookAhead2Elements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Alternatives c0Alternatives;
-		private Assignment c00AssignmentZ;
-		private Keyword c000KeywordFoo;
-		private Assignment c01AssignmentZ;
-		private Keyword c010KeywordBar;
-		private Keyword c1KeywordC;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(5);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Alternatives c0Alternatives = (Alternatives)cGroup.eContents().get(0);
+		private final Assignment c00AssignmentZ = (Assignment)c0Alternatives.eContents().get(0);
+		private final Keyword c000KeywordFoo = (Keyword)c00AssignmentZ.eContents().get(0);
+		private final Assignment c01AssignmentZ = (Assignment)c0Alternatives.eContents().get(1);
+		private final Keyword c010KeywordBar = (Keyword)c01AssignmentZ.eContents().get(0);
+		private final Keyword c1KeywordC = (Keyword)cGroup.eContents().get(1);
 		
 		// LookAhead2 : ( z = 'foo' | z = 'bar' ) 'c' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(5)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( z = 'foo' | z = 'bar' ) 'c'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// z = 'foo' | z = 'bar'
-		public Alternatives ele0Alternatives() {
-			return (c0Alternatives != null) ? c0Alternatives : (c0Alternatives = (Alternatives)eleGroup().eContents().get(0)); 
-		}
+		public Alternatives ele0Alternatives() { return c0Alternatives; }
 
 		// z = 'foo'
-		public Assignment ele00AssignmentZ() {
-			return (c00AssignmentZ != null) ? c00AssignmentZ : (c00AssignmentZ = (Assignment)ele0Alternatives().eContents().get(0)); 
-		}
+		public Assignment ele00AssignmentZ() { return c00AssignmentZ; }
 
 		// 'foo'
-		public Keyword ele000KeywordFoo() {
-			return (c000KeywordFoo != null) ? c000KeywordFoo : (c000KeywordFoo = (Keyword)ele00AssignmentZ().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordFoo() { return c000KeywordFoo; }
 
 		// z = 'bar'
-		public Assignment ele01AssignmentZ() {
-			return (c01AssignmentZ != null) ? c01AssignmentZ : (c01AssignmentZ = (Assignment)ele0Alternatives().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentZ() { return c01AssignmentZ; }
 
 		// 'bar'
-		public Keyword ele010KeywordBar() {
-			return (c010KeywordBar != null) ? c010KeywordBar : (c010KeywordBar = (Keyword)ele01AssignmentZ().eContents().get(0)); 
-		}
+		public Keyword ele010KeywordBar() { return c010KeywordBar; }
 
 		// 'c'
-		public Keyword ele1KeywordC() {
-			return (c1KeywordC != null) ? c1KeywordC : (c1KeywordC = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordC() { return c1KeywordC; }
 	}
 
 	public class LookAhead3Elements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordFoo;
-		private Keyword c001KeywordBar;
-		private Assignment c01AssignmentX;
-		private Keyword c010KeywordB;
-		private Assignment c1AssignmentZ;
-		private RuleCall c10ParserRuleCallLookAhead4;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(6);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordFoo = (Keyword)c00Group.eContents().get(0);
+		private final Keyword c001KeywordBar = (Keyword)c00Group.eContents().get(1);
+		private final Assignment c01AssignmentX = (Assignment)c0Group.eContents().get(1);
+		private final Keyword c010KeywordB = (Keyword)c01AssignmentX.eContents().get(0);
+		private final Assignment c1AssignmentZ = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10ParserRuleCallLookAhead4 = (RuleCall)c1AssignmentZ.eContents().get(0);
 		
 		// LookAhead3 : 'foo' 'bar' x = 'b' z = LookAhead4 ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(6)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'foo' 'bar' x = 'b' z = LookAhead4
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'foo' 'bar' x = 'b'
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'foo' 'bar'
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'foo'
-		public Keyword ele000KeywordFoo() {
-			return (c000KeywordFoo != null) ? c000KeywordFoo : (c000KeywordFoo = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordFoo() { return c000KeywordFoo; }
 
 		// 'bar'
-		public Keyword ele001KeywordBar() {
-			return (c001KeywordBar != null) ? c001KeywordBar : (c001KeywordBar = (Keyword)ele00Group().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordBar() { return c001KeywordBar; }
 
 		// x = 'b'
-		public Assignment ele01AssignmentX() {
-			return (c01AssignmentX != null) ? c01AssignmentX : (c01AssignmentX = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentX() { return c01AssignmentX; }
 
 		// 'b'
-		public Keyword ele010KeywordB() {
-			return (c010KeywordB != null) ? c010KeywordB : (c010KeywordB = (Keyword)ele01AssignmentX().eContents().get(0)); 
-		}
+		public Keyword ele010KeywordB() { return c010KeywordB; }
 
 		// z = LookAhead4
-		public Assignment ele1AssignmentZ() {
-			return (c1AssignmentZ != null) ? c1AssignmentZ : (c1AssignmentZ = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentZ() { return c1AssignmentZ; }
 
 		// LookAhead4
-		public RuleCall ele10ParserRuleCallLookAhead4() {
-			return (c10ParserRuleCallLookAhead4 != null) ? c10ParserRuleCallLookAhead4 : (c10ParserRuleCallLookAhead4 = (RuleCall)ele1AssignmentZ().eContents().get(0)); 
-		}
+		public RuleCall ele10ParserRuleCallLookAhead4() { return c10ParserRuleCallLookAhead4; }
 	}
 
 	public class LookAhead4Elements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private Assignment c0AssignmentX;
-		private Keyword c00KeywordC;
-		private Assignment c1AssignmentX;
-		private Keyword c10KeywordD;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(7);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final Assignment c0AssignmentX = (Assignment)cAlternatives.eContents().get(0);
+		private final Keyword c00KeywordC = (Keyword)c0AssignmentX.eContents().get(0);
+		private final Assignment c1AssignmentX = (Assignment)cAlternatives.eContents().get(1);
+		private final Keyword c10KeywordD = (Keyword)c1AssignmentX.eContents().get(0);
 		
 		// LookAhead4 : x = 'c' | x = 'd' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(7)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// x = 'c' | x = 'd'
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// x = 'c'
-		public Assignment ele0AssignmentX() {
-			return (c0AssignmentX != null) ? c0AssignmentX : (c0AssignmentX = (Assignment)eleAlternatives().eContents().get(0)); 
-		}
+		public Assignment ele0AssignmentX() { return c0AssignmentX; }
 
 		// 'c'
-		public Keyword ele00KeywordC() {
-			return (c00KeywordC != null) ? c00KeywordC : (c00KeywordC = (Keyword)ele0AssignmentX().eContents().get(0)); 
-		}
+		public Keyword ele00KeywordC() { return c00KeywordC; }
 
 		// x = 'd'
-		public Assignment ele1AssignmentX() {
-			return (c1AssignmentX != null) ? c1AssignmentX : (c1AssignmentX = (Assignment)eleAlternatives().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentX() { return c1AssignmentX; }
 
 		// 'd'
-		public Keyword ele10KeywordD() {
-			return (c10KeywordD != null) ? c10KeywordD : (c10KeywordD = (Keyword)ele1AssignmentX().eContents().get(0)); 
-		}
+		public Keyword ele10KeywordD() { return c10KeywordD; }
 	}
 	
 	public final static LookaheadTestLanguageGrammarAccess INSTANCE = new LookaheadTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java
index 9c200e5..5354782 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/OptionalEmptyTestLanguageGrammarAccess.java
@@ -11,57 +11,41 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class OptionalEmptyTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class ModelElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentChild;
-		private RuleCall c0ParserRuleCallGreeting;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Assignment cAssignmentChild = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallGreeting = (RuleCall)cAssignmentChild.eContents().get(0);
 		
 		// Model : ( child = Greeting ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( child = Greeting ) ?
-		public Assignment eleAssignmentChild() {
-			return (cAssignmentChild != null) ? cAssignmentChild : (cAssignmentChild = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentChild() { return cAssignmentChild; }
 
 		// Greeting
-		public RuleCall ele0ParserRuleCallGreeting() {
-			return (c0ParserRuleCallGreeting != null) ? c0ParserRuleCallGreeting : (c0ParserRuleCallGreeting = (RuleCall)eleAssignmentChild().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallGreeting() { return c0ParserRuleCallGreeting; }
 	}
 
 	public class GreetingElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Keyword c0KeywordHallo;
-		private Assignment c1AssignmentName;
-		private RuleCall c10LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Keyword c0KeywordHallo = (Keyword)cGroup.eContents().get(0);
+		private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall c10LexerRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
 		
 		// Greeting : 'hallo' name = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'hallo' name = ID
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'hallo'
-		public Keyword ele0KeywordHallo() {
-			return (c0KeywordHallo != null) ? c0KeywordHallo : (c0KeywordHallo = (Keyword)eleGroup().eContents().get(0)); 
-		}
+		public Keyword ele0KeywordHallo() { return c0KeywordHallo; }
 
 		// name = ID
-		public Assignment ele1AssignmentName() {
-			return (c1AssignmentName != null) ? c1AssignmentName : (c1AssignmentName = (Assignment)eleGroup().eContents().get(1)); 
-		}
+		public Assignment ele1AssignmentName() { return c1AssignmentName; }
 
 		// ID
-		public RuleCall ele10LexerRuleCallID() {
-			return (c10LexerRuleCallID != null) ? c10LexerRuleCallID : (c10LexerRuleCallID = (RuleCall)ele1AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele10LexerRuleCallID() { return c10LexerRuleCallID; }
 	}
 	
 	public final static OptionalEmptyTestLanguageGrammarAccess INSTANCE = new OptionalEmptyTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java
index e7cc4a6..2f665f8 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/PartialParserTestLanguageGrammarAccess.java
@@ -11,627 +11,429 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class PartialParserTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class ContainerElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000KeywordContainer;
-		private Assignment c0001AssignmentName;
-		private RuleCall c00010LexerRuleCallID;
-		private Keyword c001Keyword;
-		private Alternatives c01Alternatives;
-		private Assignment c010AssignmentNested;
-		private RuleCall c0100ParserRuleCallNested;
-		private Assignment c011AssignmentContent;
-		private RuleCall c0110ParserRuleCallContent;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordContainer = (Keyword)c000Group.eContents().get(0);
+		private final Assignment c0001AssignmentName = (Assignment)c000Group.eContents().get(1);
+		private final RuleCall c00010LexerRuleCallID = (RuleCall)c0001AssignmentName.eContents().get(0);
+		private final Keyword c001KeywordLeftCurlyBracket = (Keyword)c00Group.eContents().get(1);
+		private final Alternatives c01Alternatives = (Alternatives)c0Group.eContents().get(1);
+		private final Assignment c010AssignmentNested = (Assignment)c01Alternatives.eContents().get(0);
+		private final RuleCall c0100ParserRuleCallNested = (RuleCall)c010AssignmentNested.eContents().get(0);
+		private final Assignment c011AssignmentContent = (Assignment)c01Alternatives.eContents().get(1);
+		private final RuleCall c0110ParserRuleCallContent = (RuleCall)c011AssignmentContent.eContents().get(0);
+		private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
 		
 		// Container : 'container' name = ID '{' ( nested += Nested | content += Content ) * '}' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'container' name = ID '{' ( nested += Nested | content += Content ) * '}'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'container' name = ID '{' ( nested += Nested | content += Content ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'container' name = ID '{'
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'container' name = ID
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'container'
-		public Keyword ele0000KeywordContainer() {
-			return (c0000KeywordContainer != null) ? c0000KeywordContainer : (c0000KeywordContainer = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordContainer() { return c0000KeywordContainer; }
 
 		// name = ID
-		public Assignment ele0001AssignmentName() {
-			return (c0001AssignmentName != null) ? c0001AssignmentName : (c0001AssignmentName = (Assignment)ele000Group().eContents().get(1)); 
-		}
+		public Assignment ele0001AssignmentName() { return c0001AssignmentName; }
 
 		// ID
-		public RuleCall ele00010LexerRuleCallID() {
-			return (c00010LexerRuleCallID != null) ? c00010LexerRuleCallID : (c00010LexerRuleCallID = (RuleCall)ele0001AssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele00010LexerRuleCallID() { return c00010LexerRuleCallID; }
 
 		// '{'
-		public Keyword ele001Keyword() {
-			return (c001Keyword != null) ? c001Keyword : (c001Keyword = (Keyword)ele00Group().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; }
 
 		// ( nested += Nested | content += Content ) *
-		public Alternatives ele01Alternatives() {
-			return (c01Alternatives != null) ? c01Alternatives : (c01Alternatives = (Alternatives)ele0Group().eContents().get(1)); 
-		}
+		public Alternatives ele01Alternatives() { return c01Alternatives; }
 
 		// nested += Nested
-		public Assignment ele010AssignmentNested() {
-			return (c010AssignmentNested != null) ? c010AssignmentNested : (c010AssignmentNested = (Assignment)ele01Alternatives().eContents().get(0)); 
-		}
+		public Assignment ele010AssignmentNested() { return c010AssignmentNested; }
 
 		// Nested
-		public RuleCall ele0100ParserRuleCallNested() {
-			return (c0100ParserRuleCallNested != null) ? c0100ParserRuleCallNested : (c0100ParserRuleCallNested = (RuleCall)ele010AssignmentNested().eContents().get(0)); 
-		}
+		public RuleCall ele0100ParserRuleCallNested() { return c0100ParserRuleCallNested; }
 
 		// content += Content
-		public Assignment ele011AssignmentContent() {
-			return (c011AssignmentContent != null) ? c011AssignmentContent : (c011AssignmentContent = (Assignment)ele01Alternatives().eContents().get(1)); 
-		}
+		public Assignment ele011AssignmentContent() { return c011AssignmentContent; }
 
 		// Content
-		public RuleCall ele0110ParserRuleCallContent() {
-			return (c0110ParserRuleCallContent != null) ? c0110ParserRuleCallContent : (c0110ParserRuleCallContent = (RuleCall)ele011AssignmentContent().eContents().get(0)); 
-		}
+		public RuleCall ele0110ParserRuleCallContent() { return c0110ParserRuleCallContent; }
 
 		// '}'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
 	}
 
 	public class NestedElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordNested;
-		private Keyword c001Keyword;
-		private Assignment c01AssignmentNested;
-		private RuleCall c010ParserRuleCallContainer;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(2);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordNested = (Keyword)c00Group.eContents().get(0);
+		private final Keyword c001KeywordLeftCurlyBracket = (Keyword)c00Group.eContents().get(1);
+		private final Assignment c01AssignmentNested = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallContainer = (RuleCall)c01AssignmentNested.eContents().get(0);
+		private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
 		
 		// Nested : 'nested' '{' ( nested += Container ) + '}' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(2)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'nested' '{' ( nested += Container ) + '}'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'nested' '{' ( nested += Container ) +
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'nested' '{'
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'nested'
-		public Keyword ele000KeywordNested() {
-			return (c000KeywordNested != null) ? c000KeywordNested : (c000KeywordNested = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordNested() { return c000KeywordNested; }
 
 		// '{'
-		public Keyword ele001Keyword() {
-			return (c001Keyword != null) ? c001Keyword : (c001Keyword = (Keyword)ele00Group().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; }
 
 		// ( nested += Container ) +
-		public Assignment ele01AssignmentNested() {
-			return (c01AssignmentNested != null) ? c01AssignmentNested : (c01AssignmentNested = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentNested() { return c01AssignmentNested; }
 
 		// Container
-		public RuleCall ele010ParserRuleCallContainer() {
-			return (c010ParserRuleCallContainer != null) ? c010ParserRuleCallContainer : (c010ParserRuleCallContainer = (RuleCall)ele01AssignmentNested().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallContainer() { return c010ParserRuleCallContainer; }
 
 		// '}'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
 	}
 
 	public class ContentElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private RuleCall c0ParserRuleCallChildren;
-		private RuleCall c1ParserRuleCallAbstractChildren;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallChildren = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall c1ParserRuleCallAbstractChildren = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// Content : Children | AbstractChildren ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(3)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// Children | AbstractChildren
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// Children
-		public RuleCall ele0ParserRuleCallChildren() {
-			return (c0ParserRuleCallChildren != null) ? c0ParserRuleCallChildren : (c0ParserRuleCallChildren = (RuleCall)eleAlternatives().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallChildren() { return c0ParserRuleCallChildren; }
 
 		// AbstractChildren
-		public RuleCall ele1ParserRuleCallAbstractChildren() {
-			return (c1ParserRuleCallAbstractChildren != null) ? c1ParserRuleCallAbstractChildren : (c1ParserRuleCallAbstractChildren = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallAbstractChildren() { return c1ParserRuleCallAbstractChildren; }
 	}
 
 	public class ChildrenElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000KeywordChildren;
-		private Keyword c0001Keyword;
-		private Assignment c001AssignmentChildren;
-		private RuleCall c0010ParserRuleCallChild;
-		private Group c01Group;
-		private Keyword c010Keyword;
-		private Assignment c011AssignmentChildren;
-		private RuleCall c0110ParserRuleCallChild;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(4);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordChildren = (Keyword)c000Group.eContents().get(0);
+		private final Keyword c0001KeywordLeftCurlyBracket = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentChildren = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010ParserRuleCallChild = (RuleCall)c001AssignmentChildren.eContents().get(0);
+		private final Group c01Group = (Group)c0Group.eContents().get(1);
+		private final Keyword c010KeywordComma = (Keyword)c01Group.eContents().get(0);
+		private final Assignment c011AssignmentChildren = (Assignment)c01Group.eContents().get(1);
+		private final RuleCall c0110ParserRuleCallChild = (RuleCall)c011AssignmentChildren.eContents().get(0);
+		private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
 		
 		// Children : 'children' '{' children += Child ( ',' children += Child ) * '}' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(4)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'children' '{' children += Child ( ',' children += Child ) * '}'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'children' '{' children += Child ( ',' children += Child ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'children' '{' children += Child
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'children' '{'
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// 'children'
-		public Keyword ele0000KeywordChildren() {
-			return (c0000KeywordChildren != null) ? c0000KeywordChildren : (c0000KeywordChildren = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordChildren() { return c0000KeywordChildren; }
 
 		// '{'
-		public Keyword ele0001Keyword() {
-			return (c0001Keyword != null) ? c0001Keyword : (c0001Keyword = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordLeftCurlyBracket() { return c0001KeywordLeftCurlyBracket; }
 
 		// children += Child
-		public Assignment ele001AssignmentChildren() {
-			return (c001AssignmentChildren != null) ? c001AssignmentChildren : (c001AssignmentChildren = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentChildren() { return c001AssignmentChildren; }
 
 		// Child
-		public RuleCall ele0010ParserRuleCallChild() {
-			return (c0010ParserRuleCallChild != null) ? c0010ParserRuleCallChild : (c0010ParserRuleCallChild = (RuleCall)ele001AssignmentChildren().eContents().get(0)); 
-		}
+		public RuleCall ele0010ParserRuleCallChild() { return c0010ParserRuleCallChild; }
 
 		// ( ',' children += Child ) *
-		public Group ele01Group() {
-			return (c01Group != null) ? c01Group : (c01Group = (Group)ele0Group().eContents().get(1)); 
-		}
+		public Group ele01Group() { return c01Group; }
 
 		// ','
-		public Keyword ele010Keyword() {
-			return (c010Keyword != null) ? c010Keyword : (c010Keyword = (Keyword)ele01Group().eContents().get(0)); 
-		}
+		public Keyword ele010KeywordComma() { return c010KeywordComma; }
 
 		// children += Child
-		public Assignment ele011AssignmentChildren() {
-			return (c011AssignmentChildren != null) ? c011AssignmentChildren : (c011AssignmentChildren = (Assignment)ele01Group().eContents().get(1)); 
-		}
+		public Assignment ele011AssignmentChildren() { return c011AssignmentChildren; }
 
 		// Child
-		public RuleCall ele0110ParserRuleCallChild() {
-			return (c0110ParserRuleCallChild != null) ? c0110ParserRuleCallChild : (c0110ParserRuleCallChild = (RuleCall)ele011AssignmentChildren().eContents().get(0)); 
-		}
+		public RuleCall ele0110ParserRuleCallChild() { return c0110ParserRuleCallChild; }
 
 		// '}'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
 	}
 
 	public class ChildElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Keyword c0000Keyword;
-		private Keyword c0001KeywordC;
-		private Keyword c001Keyword;
-		private Assignment c01AssignmentValue;
-		private RuleCall c010ParserRuleCallNamed;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(5);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Keyword c0000KeywordHyphenMinusGreaterThanSign = (Keyword)c000Group.eContents().get(0);
+		private final Keyword c0001KeywordC = (Keyword)c000Group.eContents().get(1);
+		private final Keyword c001KeywordLeftParenthesis = (Keyword)c00Group.eContents().get(1);
+		private final Assignment c01AssignmentValue = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallNamed = (RuleCall)c01AssignmentValue.eContents().get(0);
+		private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
 		
 		// Child : '->' 'C' '(' value = Named ')' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(5)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '->' 'C' '(' value = Named ')'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '->' 'C' '(' value = Named
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '->' 'C' '('
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// '->' 'C'
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// '->'
-		public Keyword ele0000Keyword() {
-			return (c0000Keyword != null) ? c0000Keyword : (c0000Keyword = (Keyword)ele000Group().eContents().get(0)); 
-		}
+		public Keyword ele0000KeywordHyphenMinusGreaterThanSign() { return c0000KeywordHyphenMinusGreaterThanSign; }
 
 		// 'C'
-		public Keyword ele0001KeywordC() {
-			return (c0001KeywordC != null) ? c0001KeywordC : (c0001KeywordC = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordC() { return c0001KeywordC; }
 
 		// '('
-		public Keyword ele001Keyword() {
-			return (c001Keyword != null) ? c001Keyword : (c001Keyword = (Keyword)ele00Group().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordLeftParenthesis() { return c001KeywordLeftParenthesis; }
 
 		// value = Named
-		public Assignment ele01AssignmentValue() {
-			return (c01AssignmentValue != null) ? c01AssignmentValue : (c01AssignmentValue = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentValue() { return c01AssignmentValue; }
 
 		// Named
-		public RuleCall ele010ParserRuleCallNamed() {
-			return (c010ParserRuleCallNamed != null) ? c010ParserRuleCallNamed : (c010ParserRuleCallNamed = (RuleCall)ele01AssignmentValue().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallNamed() { return c010ParserRuleCallNamed; }
 
 		// ')'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
 	}
 
 	public class AbstractChildrenElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Keyword c000KeywordAbstractChildren;
-		private Keyword c001Keyword;
-		private Assignment c01AssignmentAbstractChildren;
-		private RuleCall c010ParserRuleCallAbstractChild;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(6);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Keyword c000KeywordAbstractChildren = (Keyword)c00Group.eContents().get(0);
+		private final Keyword c001KeywordLeftCurlyBracket = (Keyword)c00Group.eContents().get(1);
+		private final Assignment c01AssignmentAbstractChildren = (Assignment)c0Group.eContents().get(1);
+		private final RuleCall c010ParserRuleCallAbstractChild = (RuleCall)c01AssignmentAbstractChildren.eContents().get(0);
+		private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
 		
 		// AbstractChildren : 'abstract children' '{' ( abstractChildren += AbstractChild ) + '}' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(6)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// 'abstract children' '{' ( abstractChildren += AbstractChild ) + '}'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'abstract children' '{' ( abstractChildren += AbstractChild ) +
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// 'abstract children' '{'
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// 'abstract children'
-		public Keyword ele000KeywordAbstractChildren() {
-			return (c000KeywordAbstractChildren != null) ? c000KeywordAbstractChildren : (c000KeywordAbstractChildren = (Keyword)ele00Group().eContents().get(0)); 
-		}
+		public Keyword ele000KeywordAbstractChildren() { return c000KeywordAbstractChildren; }
 
 		// '{'
-		public Keyword ele001Keyword() {
-			return (c001Keyword != null) ? c001Keyword : (c001Keyword = (Keyword)ele00Group().eContents().get(1)); 
-		}
+		public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; }
 
 		// ( abstractChildren += AbstractChild ) +
-		public Assignment ele01AssignmentAbstractChildren() {
-			return (c01AssignmentAbstractChildren != null) ? c01AssignmentAbstractChildren : (c01AssignmentAbstractChildren = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentAbstractChildren() { return c01AssignmentAbstractChildren; }
 
 		// AbstractChild
-		public RuleCall ele010ParserRuleCallAbstractChild() {
-			return (c010ParserRuleCallAbstractChild != null) ? c010ParserRuleCallAbstractChild : (c010ParserRuleCallAbstractChild = (RuleCall)ele01AssignmentAbstractChildren().eContents().get(0)); 
-		}
+		public RuleCall ele010ParserRuleCallAbstractChild() { return c010ParserRuleCallAbstractChild; }
 
 		// '}'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightCurlyBracket() { return c1KeywordRightCurlyBracket; }
 	}
 
 	public class AbstractChildElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Alternatives cAlternatives;
-		private RuleCall c0ParserRuleCallFirstConcrete;
-		private RuleCall c1ParserRuleCallSecondConcrete;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(7);
+		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+		private final RuleCall c0ParserRuleCallFirstConcrete = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall c1ParserRuleCallSecondConcrete = (RuleCall)cAlternatives.eContents().get(1);
 		
 		// AbstractChild : FirstConcrete | SecondConcrete ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(7)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// FirstConcrete | SecondConcrete
-		public Alternatives eleAlternatives() {
-			return (cAlternatives != null) ? cAlternatives : (cAlternatives = (Alternatives)getRule().eContents().get(1)); 
-		}
+		public Alternatives eleAlternatives() { return cAlternatives; }
 
 		// FirstConcrete
-		public RuleCall ele0ParserRuleCallFirstConcrete() {
-			return (c0ParserRuleCallFirstConcrete != null) ? c0ParserRuleCallFirstConcrete : (c0ParserRuleCallFirstConcrete = (RuleCall)eleAlternatives().eContents().get(0)); 
-		}
+		public RuleCall ele0ParserRuleCallFirstConcrete() { return c0ParserRuleCallFirstConcrete; }
 
 		// SecondConcrete
-		public RuleCall ele1ParserRuleCallSecondConcrete() {
-			return (c1ParserRuleCallSecondConcrete != null) ? c1ParserRuleCallSecondConcrete : (c1ParserRuleCallSecondConcrete = (RuleCall)eleAlternatives().eContents().get(1)); 
-		}
+		public RuleCall ele1ParserRuleCallSecondConcrete() { return c1ParserRuleCallSecondConcrete; }
 	}
 
 	public class FirstConcreteElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Keyword c00000Keyword;
-		private Keyword c00001KeywordF;
-		private Keyword c0001Keyword;
-		private Assignment c001AssignmentValue;
-		private RuleCall c0010ParserRuleCallNamed;
-		private Assignment c01AssignmentReferencedContainer;
-		private CrossReference c010CrossReferenceContainer;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(8);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Keyword c00000KeywordHyphenMinusGreaterThanSign = (Keyword)c0000Group.eContents().get(0);
+		private final Keyword c00001KeywordF = (Keyword)c0000Group.eContents().get(1);
+		private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentValue = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010ParserRuleCallNamed = (RuleCall)c001AssignmentValue.eContents().get(0);
+		private final Assignment c01AssignmentReferencedContainer = (Assignment)c0Group.eContents().get(1);
+		private final CrossReference c010CrossReferenceContainer = (CrossReference)c01AssignmentReferencedContainer.eContents().get(0);
+		private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
 		
 		// FirstConcrete : '->' 'F' '(' value = Named ( referencedContainer = [ Container ] ) ? ')' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(8)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '->' 'F' '(' value = Named ( referencedContainer = [ Container ] ) ? ')'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '->' 'F' '(' value = Named ( referencedContainer = [ Container ] ) ?
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '->' 'F' '(' value = Named
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// '->' 'F' '('
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// '->' 'F'
-		public Group ele0000Group() {
-			return (c0000Group != null) ? c0000Group : (c0000Group = (Group)ele000Group().eContents().get(0)); 
-		}
+		public Group ele0000Group() { return c0000Group; }
 
 		// '->'
-		public Keyword ele00000Keyword() {
-			return (c00000Keyword != null) ? c00000Keyword : (c00000Keyword = (Keyword)ele0000Group().eContents().get(0)); 
-		}
+		public Keyword ele00000KeywordHyphenMinusGreaterThanSign() { return c00000KeywordHyphenMinusGreaterThanSign; }
 
 		// 'F'
-		public Keyword ele00001KeywordF() {
-			return (c00001KeywordF != null) ? c00001KeywordF : (c00001KeywordF = (Keyword)ele0000Group().eContents().get(1)); 
-		}
+		public Keyword ele00001KeywordF() { return c00001KeywordF; }
 
 		// '('
-		public Keyword ele0001Keyword() {
-			return (c0001Keyword != null) ? c0001Keyword : (c0001Keyword = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordLeftParenthesis() { return c0001KeywordLeftParenthesis; }
 
 		// value = Named
-		public Assignment ele001AssignmentValue() {
-			return (c001AssignmentValue != null) ? c001AssignmentValue : (c001AssignmentValue = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentValue() { return c001AssignmentValue; }
 
 		// Named
-		public RuleCall ele0010ParserRuleCallNamed() {
-			return (c0010ParserRuleCallNamed != null) ? c0010ParserRuleCallNamed : (c0010ParserRuleCallNamed = (RuleCall)ele001AssignmentValue().eContents().get(0)); 
-		}
+		public RuleCall ele0010ParserRuleCallNamed() { return c0010ParserRuleCallNamed; }
 
 		// ( referencedContainer = [ Container ] ) ?
-		public Assignment ele01AssignmentReferencedContainer() {
-			return (c01AssignmentReferencedContainer != null) ? c01AssignmentReferencedContainer : (c01AssignmentReferencedContainer = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentReferencedContainer() { return c01AssignmentReferencedContainer; }
 
 		// [ Container ]
-		public CrossReference ele010CrossReferenceContainer() {
-			return (c010CrossReferenceContainer != null) ? c010CrossReferenceContainer : (c010CrossReferenceContainer = (CrossReference)ele01AssignmentReferencedContainer().eContents().get(0)); 
-		}
+		public CrossReference ele010CrossReferenceContainer() { return c010CrossReferenceContainer; }
 
 		// ')'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
 	}
 
 	public class SecondConcreteElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Group c00000Group;
-		private Keyword c000000Keyword;
-		private Keyword c000001KeywordF;
-		private Keyword c00001KeywordS;
-		private Keyword c0001Keyword;
-		private Assignment c001AssignmentValue;
-		private RuleCall c0010ParserRuleCallNamed;
-		private Assignment c01AssignmentReferencedChildren;
-		private CrossReference c010CrossReferenceChild;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(9);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Group c00000Group = (Group)c0000Group.eContents().get(0);
+		private final Keyword c000000KeywordHyphenMinusGreaterThanSign = (Keyword)c00000Group.eContents().get(0);
+		private final Keyword c000001KeywordF = (Keyword)c00000Group.eContents().get(1);
+		private final Keyword c00001KeywordS = (Keyword)c0000Group.eContents().get(1);
+		private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1);
+		private final Assignment c001AssignmentValue = (Assignment)c00Group.eContents().get(1);
+		private final RuleCall c0010ParserRuleCallNamed = (RuleCall)c001AssignmentValue.eContents().get(0);
+		private final Assignment c01AssignmentReferencedChildren = (Assignment)c0Group.eContents().get(1);
+		private final CrossReference c010CrossReferenceChild = (CrossReference)c01AssignmentReferencedChildren.eContents().get(0);
+		private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1);
 		
 		// SecondConcrete : '->' 'F' 'S' '(' value = Named ( referencedChildren += [ Child ] ) ? ')' ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(9)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// '->' 'F' 'S' '(' value = Named ( referencedChildren += [ Child ] ) ? ')'
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// '->' 'F' 'S' '(' value = Named ( referencedChildren += [ Child ] ) ?
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0)); 
-		}
+		public Group ele0Group() { return c0Group; }
 
 		// '->' 'F' 'S' '(' value = Named
-		public Group ele00Group() {
-			return (c00Group != null) ? c00Group : (c00Group = (Group)ele0Group().eContents().get(0)); 
-		}
+		public Group ele00Group() { return c00Group; }
 
 		// '->' 'F' 'S' '('
-		public Group ele000Group() {
-			return (c000Group != null) ? c000Group : (c000Group = (Group)ele00Group().eContents().get(0)); 
-		}
+		public Group ele000Group() { return c000Group; }
 
 		// '->' 'F' 'S'
-		public Group ele0000Group() {
-			return (c0000Group != null) ? c0000Group : (c0000Group = (Group)ele000Group().eContents().get(0)); 
-		}
+		public Group ele0000Group() { return c0000Group; }
 
 		// '->' 'F'
-		public Group ele00000Group() {
-			return (c00000Group != null) ? c00000Group : (c00000Group = (Group)ele0000Group().eContents().get(0)); 
-		}
+		public Group ele00000Group() { return c00000Group; }
 
 		// '->'
-		public Keyword ele000000Keyword() {
-			return (c000000Keyword != null) ? c000000Keyword : (c000000Keyword = (Keyword)ele00000Group().eContents().get(0)); 
-		}
+		public Keyword ele000000KeywordHyphenMinusGreaterThanSign() { return c000000KeywordHyphenMinusGreaterThanSign; }
 
 		// 'F'
-		public Keyword ele000001KeywordF() {
-			return (c000001KeywordF != null) ? c000001KeywordF : (c000001KeywordF = (Keyword)ele00000Group().eContents().get(1)); 
-		}
+		public Keyword ele000001KeywordF() { return c000001KeywordF; }
 
 		// 'S'
-		public Keyword ele00001KeywordS() {
-			return (c00001KeywordS != null) ? c00001KeywordS : (c00001KeywordS = (Keyword)ele0000Group().eContents().get(1)); 
-		}
+		public Keyword ele00001KeywordS() { return c00001KeywordS; }
 
 		// '('
-		public Keyword ele0001Keyword() {
-			return (c0001Keyword != null) ? c0001Keyword : (c0001Keyword = (Keyword)ele000Group().eContents().get(1)); 
-		}
+		public Keyword ele0001KeywordLeftParenthesis() { return c0001KeywordLeftParenthesis; }
 
 		// value = Named
-		public Assignment ele001AssignmentValue() {
-			return (c001AssignmentValue != null) ? c001AssignmentValue : (c001AssignmentValue = (Assignment)ele00Group().eContents().get(1)); 
-		}
+		public Assignment ele001AssignmentValue() { return c001AssignmentValue; }
 
 		// Named
-		public RuleCall ele0010ParserRuleCallNamed() {
-			return (c0010ParserRuleCallNamed != null) ? c0010ParserRuleCallNamed : (c0010ParserRuleCallNamed = (RuleCall)ele001AssignmentValue().eContents().get(0)); 
-		}
+		public RuleCall ele0010ParserRuleCallNamed() { return c0010ParserRuleCallNamed; }
 
 		// ( referencedChildren += [ Child ] ) ?
-		public Assignment ele01AssignmentReferencedChildren() {
-			return (c01AssignmentReferencedChildren != null) ? c01AssignmentReferencedChildren : (c01AssignmentReferencedChildren = (Assignment)ele0Group().eContents().get(1)); 
-		}
+		public Assignment ele01AssignmentReferencedChildren() { return c01AssignmentReferencedChildren; }
 
 		// [ Child ]
-		public CrossReference ele010CrossReferenceChild() {
-			return (c010CrossReferenceChild != null) ? c010CrossReferenceChild : (c010CrossReferenceChild = (CrossReference)ele01AssignmentReferencedChildren().eContents().get(0)); 
-		}
+		public CrossReference ele010CrossReferenceChild() { return c010CrossReferenceChild; }
 
 		// ')'
-		public Keyword ele1Keyword() {
-			return (c1Keyword != null) ? c1Keyword : (c1Keyword = (Keyword)eleGroup().eContents().get(1)); 
-		}
+		public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; }
 	}
 
 	public class NamedElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Assignment cAssignmentName;
-		private RuleCall c0LexerRuleCallID;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(10);
+		private final Assignment cAssignmentName = (Assignment)rule.eContents().get(1);
+		private final RuleCall c0LexerRuleCallID = (RuleCall)cAssignmentName.eContents().get(0);
 		
 		// Named : name = ID ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(10)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// name = ID
-		public Assignment eleAssignmentName() {
-			return (cAssignmentName != null) ? cAssignmentName : (cAssignmentName = (Assignment)getRule().eContents().get(1)); 
-		}
+		public Assignment eleAssignmentName() { return cAssignmentName; }
 
 		// ID
-		public RuleCall ele0LexerRuleCallID() {
-			return (c0LexerRuleCallID != null) ? c0LexerRuleCallID : (c0LexerRuleCallID = (RuleCall)eleAssignmentName().eContents().get(0)); 
-		}
+		public RuleCall ele0LexerRuleCallID() { return c0LexerRuleCallID; }
 	}
 	
 	public final static PartialParserTestLanguageGrammarAccess INSTANCE = new PartialParserTestLanguageGrammarAccess();
diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java
index ac0f31f..be4fa70 100644
--- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java
+++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/testlanguages/services/ReferenceGrammarTestLanguageGrammarAccess.java
@@ -11,618 +11,420 @@ import org.eclipse.xtext.builtin.XtextBuiltinGrammarAccess;
 public class ReferenceGrammarTestLanguageGrammarAccess extends BaseEPackageAccess implements IGrammarAccess {
 	
 	public class SpielplatzElements implements IParserRuleAccess {
-		private ParserRule rule;
-		private Group cGroup;
-		private Group c0Group;
-		private Group c00Group;
-		private Group c000Group;
-		private Group c0000Group;
-		private Keyword c00000KeywordSpielplatz;
-		private Assignment c00001AssignmentGroesse;
-		private RuleCall c000010LexerRuleCallINT;
-		private Assignment c0001AssignmentBeschreibung;
-		private RuleCall c00010LexerRuleCallSTRING;
-		private Keyword c001Keyword;
-		private Alternatives c01Alternatives;
-		private Alternatives c010Alternatives;
-		private Alternatives c0100Alternatives;
-		private Assignment c01000AssignmentKinder;
-		private RuleCall c010000ParserRuleCallKind;
-		private Assignment c01001AssignmentErzieher;
-		private RuleCall c010010ParserRuleCallErwachsener;
-		private Assignment c0101AssignmentSpielzeuge;
-		private RuleCall c01010ParserRuleCallSpielzeug;
-		private Assignment c011AssignmentFamilie;
-		private RuleCall c0110ParserRuleCallFamilie;
-		private Keyword c1Keyword;
+		private final ParserRule rule = (ParserRule) getGrammar().eContents().get(1);
+		private final Group cGroup = (Group)rule.eContents().get(1);
+		private final Group c0Group = (Group)cGroup.eContents().get(0);
+		private final Group c00Group = (Group)c0Group.eContents().get(0);
+		private final Group c000Group = (Group)c00Group.eContents().get(0);
+		private final Group c0000Group = (Group)c000Group.eContents().get(0);
+		private final Keyword c00000KeywordSpielplatz = (Keyword)c0000Group.eContents().get(0);
+		private final Assignment c00001AssignmentGroesse = (Assignment)c0000Group.eContents().get(1);
+		private final RuleCall c000010LexerRuleCallINT = (RuleCall)c00001AssignmentGroesse.eContents().get(0);
+		private final Assignment c0001AssignmentBeschreibung = (Assignment)c000Group.eContents().get(1);
+		private final RuleCall c00010LexerRuleCallSTRING = (RuleCall)c0001AssignmentBeschreibung.eContents().get(0);
+		private final Keyword c001KeywordLeftCurlyBracket = (Keyword)c00Group.eContents().get(1);
+		private final Alternatives c01Alternatives = (Alternatives)c0Group.eContents().get(1);
+		private final Alternatives c010Alternatives = (Alternatives)c01Alternatives.eContents().get(0);
+		private final Alternatives c0100Alternatives = (Alternatives)c010Alternatives.eContents().get(0);
+		private final Assignment c01000AssignmentKinder = (Assignment)c0100Alternatives.eContents().get(0);
+		private final RuleCall c010000ParserRuleCallKind = (RuleCall)c01000AssignmentKinder.eContents().get(0);
+		private final Assignment c01001AssignmentErzieher = (Assignment)c0100Alternatives.eContents().get(1);
+		private final RuleCall c010010ParserRuleCallErwachsener = (RuleCall)c01001AssignmentErzieher.eContents().get(0);
+		private final Assignment c0101AssignmentSpielzeuge = (Assignment)c010Alternatives.eContents().get(1);
+		private final RuleCall c01010ParserRuleCallSpielzeug = (RuleCall)c0101AssignmentSpielzeuge.eContents().get(0);
+		private final Assignment c011AssignmentFamilie = (Assignment)c01Alternatives.eContents().get(1);
+		private final RuleCall c0110ParserRuleCallFamilie = (RuleCall)c011AssignmentFamilie.eContents().get(0);
+		private final Keyword c1KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(1);
 		
 		// Spielplatz : ( 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie ) * '}' ) ? ;
-		public ParserRule getRule() {
-			return (rule != null) ? rule : (rule = (ParserRule) getGrammar().eContents().get(1)); 
-		}
+		public ParserRule getRule() { return rule; }
 
 		// ( 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie ) * '}' ) ?
-		public Group eleGroup() {
-			return (cGroup != null) ? cGroup : (cGroup = (Group)getRule().eContents().get(1)); 
-		}
+		public Group eleGroup() { return cGroup; }
 
 		// 'spielplatz' groesse = INT ( beschreibung = STRING ) ? '{' ( kinder += Kind | erzieher += Erwachsener | spielzeuge += Spielzeug | familie += Familie ) *
-		public Group ele0Group() {
-			return (c0Group != null) ? c0Group : (c0Group = (Group)eleGroup().eContents().get(0));