diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
index 19dcc3f4354..31aed396037 100644
--- a/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
+++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
@@ -166,7 +166,7 @@ type <parser.name> struct {
 	<endif>
 }
 
-var <parser.grammarName; format="cap">ParserStaticData struct {
+type <parser.grammarName; format="cap">ParserStaticData struct {
   once                   sync.Once
   serializedATN          []int32
   LiteralNames           []string
@@ -198,10 +198,9 @@ func <parser.grammarName; format="lower">ParserInit() {
   staticData.serializedATN = <atn>
   deserializer := antlr.NewATNDeserializer(nil)
   staticData.atn = deserializer.Deserialize(staticData.serializedATN)
-  atn := staticData.atn
-  staticData.decisionToDFA = make([]*antlr.DFA, len(atn.DecisionToState))
+  staticData.decisionToDFA = make([]*antlr.DFA, len(staticData.atn.DecisionToState))
   decisionToDFA := staticData.decisionToDFA
-  for index, state := range atn.DecisionToState {
+  for index, state := range staticData.atn.DecisionToState {
     decisionToDFA[index] = antlr.NewDFA(state, index)
   }
 }
@@ -210,14 +209,15 @@ func <parser.grammarName; format="lower">ParserInit() {
 // static state used to implement the parser is lazily initialized during the first call to
 // New<parser.name>(). You can call this function if you wish to initialize the static state ahead
 // of time.
-func <parser.name; format="cap">Init() {
-  staticData := &<parser.grammarName; format="cap">ParserStaticData
-  staticData.once.Do(<parser.grammarName; format="lower">ParserInit)
+func <parser.name; format="cap">Init() *<parser.grammarName; format="cap">ParserStaticData {
+  staticData := &<parser.grammarName; format="cap">ParserStaticData{}
+  <parser.grammarName; format="lower">ParserInit(staticData)
+  return staticData
 }
 
 // New<parser.name> produces a new parser instance for the optional input antlr.TokenStream.
 func New<parser.name>(input antlr.TokenStream) *<parser.name> {
-	<parser.name; format="cap">Init()
+	staticData := <parser.name; format="cap">Init()
 	this := new(<parser.name>)
 	this.BaseParser = antlr.NewBaseParser(input)
   staticData := &<parser.grammarName; format="cap">ParserStaticData