diff --git a/ParserGen/Parser.cpp b/ParserGen/Parser.cpp
index ae8c237..d3b8c41 100644
--- a/ParserGen/Parser.cpp
+++ b/ParserGen/Parser.cpp
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 // Grammar %HEADERS_FOR_CPP begins
@@ -1135,7 +1135,7 @@ bux::T_StateID C_ParserPolicy::nextState(bux::T_StateID state, bux::T_LexID inpu
     else if (input >= ENCODED_TOKEN_LB)
         LOGIC_ERROR("Invalid input: state={} input={}", (int)state, printToken(input));
 
-    auto end = mapGoto + 25;
+    static constinit const auto end = mapGoto + 25;
     auto found = std::lower_bound(mapGoto, end, state, [](const C_MapGoto &i, bux::T_StateID state_) {
         return i.m_curState < state_;
     });
diff --git a/ParserGen/Parser.h b/ParserGen/Parser.h
index 13e8fe5..d6e5503 100644
--- a/ParserGen/Parser.h
+++ b/ParserGen/Parser.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once
@@ -15,7 +15,7 @@ class C_BNFParser: public bux::LR1::C_Parser
 public:
 
     // Data
-    C_BNFContext            m_context;
+    ParserGen::C_BNFContext& m_context;
 
     // Ctor
     template<class...T_Args>
diff --git a/ParserGen/ParserIdDef.h b/ParserGen/ParserIdDef.h
index 41c0a1f..fc4e592 100644
--- a/ParserGen/ParserIdDef.h
+++ b/ParserGen/ParserIdDef.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once
diff --git a/ScannerGen/Parser.cpp b/ScannerGen/Parser.cpp
index 543d78d..d15e981 100644
--- a/ScannerGen/Parser.cpp
+++ b/ScannerGen/Parser.cpp
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 // Grammar %HEADERS_FOR_CPP begins
@@ -1463,7 +1463,7 @@ bux::T_StateID C_ParserPolicy::nextState(bux::T_StateID state, bux::T_LexID inpu
     else if (input >= ENCODED_TOKEN_LB)
         LOGIC_ERROR("Invalid input: state={} input={}", (int)state, printToken(input));
 
-    auto end = mapGoto + 60;
+    static constinit const auto end = mapGoto + 60;
     auto found = std::lower_bound(mapGoto, end, state, [](const C_MapGoto &i, bux::T_StateID state_) {
         return i.m_curState < state_;
     });
diff --git a/ScannerGen/Parser.h b/ScannerGen/Parser.h
index 3be2fa7..8939f2c 100644
--- a/ScannerGen/Parser.h
+++ b/ScannerGen/Parser.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once
diff --git a/ScannerGen/ParserIdDef.h b/ScannerGen/ParserIdDef.h
index cdf140f..0a82ca4 100644
--- a/ScannerGen/ParserIdDef.h
+++ b/ScannerGen/ParserIdDef.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once
diff --git a/example/BisonGLR/Parser.cpp b/example/BisonGLR/Parser.cpp
index 12e20af..0b8ab2d 100644
--- a/example/BisonGLR/Parser.cpp
+++ b/example/BisonGLR/Parser.cpp
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 // Grammar %HEADERS_FOR_CPP begins
@@ -533,7 +533,7 @@ bux::T_StateID C_ParserPolicy::nextState(bux::T_StateID state, bux::T_LexID inpu
     else if (input >= ENCODED_TOKEN_LB)
         LOGIC_ERROR("Invalid input: state={} input={}", (int)state, printToken(input));
 
-    auto end = mapGoto + 35;
+    static constinit const auto end = mapGoto + 35;
     auto found = std::lower_bound(mapGoto, end, state, [](const C_MapGoto &i, bux::T_StateID state_) {
         return i.m_curState < state_;
     });
diff --git a/example/BisonGLR/Parser.h b/example/BisonGLR/Parser.h
index 75c4810..26d989c 100644
--- a/example/BisonGLR/Parser.h
+++ b/example/BisonGLR/Parser.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once
diff --git a/example/BisonGLR/ParserIdDef.h b/example/BisonGLR/ParserIdDef.h
index 47a0f54..ba7a1c5 100644
--- a/example/BisonGLR/ParserIdDef.h
+++ b/example/BisonGLR/ParserIdDef.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once
diff --git a/example/CalcInt/Parser.cpp b/example/CalcInt/Parser.cpp
index ea10080..ad604c0 100644
--- a/example/CalcInt/Parser.cpp
+++ b/example/CalcInt/Parser.cpp
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 // Grammar %HEADERS_FOR_CPP undefined (expanded here otherwise)
@@ -384,7 +384,7 @@ bux::T_StateID C_ParserPolicy::nextState(bux::T_StateID state, bux::T_LexID inpu
     else if (input >= ENCODED_TOKEN_LB)
         LOGIC_ERROR("Invalid input: state={} input={}", (int)state, printToken(input));
 
-    auto end = mapGoto + 20;
+    static constinit const auto end = mapGoto + 20;
     auto found = std::lower_bound(mapGoto, end, state, [](const C_MapGoto &i, bux::T_StateID state_) {
         return i.m_curState < state_;
     });
diff --git a/example/CalcInt/Parser.h b/example/CalcInt/Parser.h
index bba324e..fdd129b 100644
--- a/example/CalcInt/Parser.h
+++ b/example/CalcInt/Parser.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once
diff --git a/example/CalcInt/ParserIdDef.h b/example/CalcInt/ParserIdDef.h
index 769f277..18862f4 100644
--- a/example/CalcInt/ParserIdDef.h
+++ b/example/CalcInt/ParserIdDef.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once
diff --git a/example/MinLang/Parser.cpp b/example/MinLang/Parser.cpp
index 5069fba..ee01d84 100644
--- a/example/MinLang/Parser.cpp
+++ b/example/MinLang/Parser.cpp
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 // Grammar %HEADERS_FOR_CPP undefined (expanded here otherwise)
diff --git a/example/MinLang/Parser.h b/example/MinLang/Parser.h
index 04ab940..d17e306 100644
--- a/example/MinLang/Parser.h
+++ b/example/MinLang/Parser.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once
diff --git a/example/MinLang/ParserIdDef.h b/example/MinLang/ParserIdDef.h
index 66e6790..86e6a0f 100644
--- a/example/MinLang/ParserIdDef.h
+++ b/example/MinLang/ParserIdDef.h
@@ -1,4 +1,4 @@
-// This file is fully generated by running parsergen v1.7.1
+// This file is fully generated by running parsergen v1.7.5
 // with grammer definition file "grammar.txt"
 
 #pragma once