diff --git a/alib2data/src/grammar/Grammar.h b/alib2data/src/grammar/Grammar.h
index df680b48f2f6e5ccdb1520eb76f96b60ca803519..5bc5e0a6016a835ede26038ad6a7113aa24e1e65 100644
--- a/alib2data/src/grammar/Grammar.h
+++ b/alib2data/src/grammar/Grammar.h
@@ -8,9 +8,6 @@
 #ifndef GRAMMAR_H_
 #define GRAMMAR_H_
 
-#include <base/WrapperBase.hpp>
-#include "GrammarBase.h"
-
 #include <alib/type_traits>
 
 namespace grammar {
@@ -18,10 +15,7 @@ namespace grammar {
 /**
  * Wrapper around grammars.
  */
-class Grammar : public base::WrapperBase < GrammarBase > {
-	using base::WrapperBase < GrammarBase >::WrapperBase;
-
-};
+class Grammar;
 
 template < class T >
 using TerminalSymbolTypeOfGrammar = typename std::decay < decltype (std::declval<T>().getTerminalAlphabet()) >::type::value_type;
diff --git a/alib2data/src/grammar/xml/ContextFree/CFG.cpp b/alib2data/src/grammar/xml/ContextFree/CFG.cpp
index da44b4a1757789209817444b6fdd0a5689cfb4a6..4a45a2c4f771582645332acc7e546fb741dcf025 100644
--- a/alib2data/src/grammar/xml/ContextFree/CFG.cpp
+++ b/alib2data/src/grammar/xml/ContextFree/CFG.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::CFG < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::CFG < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::CFG < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::CFG < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::CFG < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/ContextFree/CNF.cpp b/alib2data/src/grammar/xml/ContextFree/CNF.cpp
index a6ca54e89de76482236c1b4475841c486b7207c1..fbeeaa90e5b1e7b56268d30e82585b15d968a239 100644
--- a/alib2data/src/grammar/xml/ContextFree/CNF.cpp
+++ b/alib2data/src/grammar/xml/ContextFree/CNF.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::CNF < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::CNF < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::CNF < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::CNF < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::CNF < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/ContextFree/EpsilonFreeCFG.cpp b/alib2data/src/grammar/xml/ContextFree/EpsilonFreeCFG.cpp
index 7ace9f5751795e0d8f57bb1a97e17955386e8dc3..bc472e3ede9fe2d4b358b42af3e87e95ef3cadb7 100644
--- a/alib2data/src/grammar/xml/ContextFree/EpsilonFreeCFG.cpp
+++ b/alib2data/src/grammar/xml/ContextFree/EpsilonFreeCFG.cpp
@@ -14,9 +14,8 @@
 namespace {
 
 static auto xmlWrite = registration::XmlWriterRegister < grammar::EpsilonFreeCFG < > > ( );
-static auto xmlGroup = registration::XmlReaderRegister < grammar::EpsilonFreeCFG < > > ( );
+static auto xmlRead = registration::XmlReaderRegister < grammar::EpsilonFreeCFG < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::EpsilonFreeCFG < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::EpsilonFreeCFG < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::EpsilonFreeCFG < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/ContextFree/GNF.cpp b/alib2data/src/grammar/xml/ContextFree/GNF.cpp
index 590b4e025394017b51f791274cd55e8eea4979d7..884bc8094caa868b30b910fd7471ef39675b70b8 100644
--- a/alib2data/src/grammar/xml/ContextFree/GNF.cpp
+++ b/alib2data/src/grammar/xml/ContextFree/GNF.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::GNF < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::GNF < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::GNF < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::GNF < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::GNF < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/ContextFree/LG.cpp b/alib2data/src/grammar/xml/ContextFree/LG.cpp
index 350dc2af23330040172360e29ad78530ba896f8e..4c4dfbe4a486263e37a6b50aaddf8b4cdb8f0796 100644
--- a/alib2data/src/grammar/xml/ContextFree/LG.cpp
+++ b/alib2data/src/grammar/xml/ContextFree/LG.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::LG < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::LG < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::LG < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::LG < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::LG < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/ContextSensitive/CSG.cpp b/alib2data/src/grammar/xml/ContextSensitive/CSG.cpp
index acdceade10afbd06976cd824906f511b61982b36..ea1b330cab84fd8316e104f88a99db13f83fe542 100644
--- a/alib2data/src/grammar/xml/ContextSensitive/CSG.cpp
+++ b/alib2data/src/grammar/xml/ContextSensitive/CSG.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::CSG < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::CSG < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::CSG < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::CSG < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::CSG < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/ContextSensitive/NonContractingGrammar.cpp b/alib2data/src/grammar/xml/ContextSensitive/NonContractingGrammar.cpp
index c826c3895a488b7e90307cfb8688dfca38ec6d9e..ddbf0f8d2707bfeb62d00de4cb4d07a3d77e50f9 100644
--- a/alib2data/src/grammar/xml/ContextSensitive/NonContractingGrammar.cpp
+++ b/alib2data/src/grammar/xml/ContextSensitive/NonContractingGrammar.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::NonContractingGrammar < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::NonContractingGrammar < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::NonContractingGrammar < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::NonContractingGrammar < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::NonContractingGrammar < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/Regular/LeftLG.cpp b/alib2data/src/grammar/xml/Regular/LeftLG.cpp
index d57216e17085ccfeff8c7899cc344e3419e96669..1fa066646c4ee3cee2150a0ee7a1e230663b9f5d 100644
--- a/alib2data/src/grammar/xml/Regular/LeftLG.cpp
+++ b/alib2data/src/grammar/xml/Regular/LeftLG.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::LeftLG < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::LeftLG < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::LeftLG < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::LeftLG < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::LeftLG < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/Regular/LeftRG.cpp b/alib2data/src/grammar/xml/Regular/LeftRG.cpp
index 33071082fbbcdb5d2fdf0ab0ac6d2db28dddb39d..b34f182323b41bd3f883f80a45b5fdcea3715b14 100644
--- a/alib2data/src/grammar/xml/Regular/LeftRG.cpp
+++ b/alib2data/src/grammar/xml/Regular/LeftRG.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::LeftRG < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::LeftRG < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::LeftRG < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::LeftRG < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::LeftRG < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/Regular/RightLG.cpp b/alib2data/src/grammar/xml/Regular/RightLG.cpp
index 8ef938812c8e7cd7f7a765a299f498b5d59e2d1e..fbad2cc2b76c3506c5ba809f6deb723d082f85d4 100644
--- a/alib2data/src/grammar/xml/Regular/RightLG.cpp
+++ b/alib2data/src/grammar/xml/Regular/RightLG.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::RightLG < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::RightLG < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::RightLG < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::RightLG < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::RightLG < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/Regular/RightRG.cpp b/alib2data/src/grammar/xml/Regular/RightRG.cpp
index bda30df9144cf87b71ac3d36116e66fa6233353e..fc0715b86e1e5e65ffab14e224ffa8d93b93a893 100644
--- a/alib2data/src/grammar/xml/Regular/RightRG.cpp
+++ b/alib2data/src/grammar/xml/Regular/RightRG.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::RightRG < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::RightRG < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::RightRG < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::RightRG < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::RightRG < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp b/alib2data/src/grammar/xml/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
index 2911cd1e4c9ba08ac21e2ac6665686e5c94a2691..960a42b0a86d7f5fd6d220ddaf33c16b90d11377 100644
--- a/alib2data/src/grammar/xml/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/xml/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::ContextPreservingUnrestrictedGrammar < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::ContextPreservingUnrestrictedGrammar < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::ContextPreservingUnrestrictedGrammar < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::ContextPreservingUnrestrictedGrammar < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::ContextPreservingUnrestrictedGrammar < > > ( );
 
 } /* namespace */
diff --git a/alib2data/src/grammar/xml/Unrestricted/UnrestrictedGrammar.cpp b/alib2data/src/grammar/xml/Unrestricted/UnrestrictedGrammar.cpp
index 7cfa738e90c4ddb06869982cd67f8a144ca17533..1a18af8ac6c38205a090414dd691b7a90a4a0bc1 100644
--- a/alib2data/src/grammar/xml/Unrestricted/UnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/xml/Unrestricted/UnrestrictedGrammar.cpp
@@ -16,7 +16,6 @@ namespace {
 static auto xmlWrite = registration::XmlWriterRegister < grammar::UnrestrictedGrammar < > > ( );
 static auto xmlRead = registration::XmlReaderRegister < grammar::UnrestrictedGrammar < > > ( );
 
-static auto xmlGroup1 = registration::XmlRegisterTypeInGroup < grammar::Grammar, grammar::UnrestrictedGrammar < > > ( );
-static auto xmlGroup2 = registration::XmlRegisterTypeInGroup < object::Object, grammar::UnrestrictedGrammar < > > ( );
+static auto xmlGroup = registration::XmlRegisterTypeInGroup < object::Object, grammar::UnrestrictedGrammar < > > ( );
 
 } /* namespace */