diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/go/Go.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/go/Go.test.stg
index da5053e83..6eed1e7a8 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/go/Go.test.stg
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/go/Go.test.stg
@@ -159,9 +159,9 @@ True() ::= "true"
 
 Not(v) ::= "!<v>"
 
-Assert(s) ::= <<assert(<s>)>>
+Assert(s) ::= ""
 
-Cast(t,v) ::= "((<t>)<v>)"
+Cast(t,v) ::= "(<v>)"
 
 Append(a,b) ::= "<a> + fmt.Sprint(<b>)"
 
@@ -169,7 +169,7 @@ Concat(a,b) ::= "<a><b>"
 
 DeclareLocal(s,v) ::= "<s> := <v>"
 
-AssertIsList(v) ::= "List\<?> __ttt__ = <v>;" // just use type system
+AssertIsList(v) ::= ""
 
 AssignLocal(s,v) ::= "<s> = <v>;"
 
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 a655e5620..612d2a058 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
@@ -596,7 +596,7 @@ TokenPropertyRef_line(t) ::= "(func() int { if <ctx(t)>.get<t.label; format={cap
 TokenPropertyRef_pos(t) ::= "(func() int { if <ctx(t)>.get<t.label; format={cap}>() == nil { return 0 } else { return <ctx(t)>.get<t.label; format={cap}>().GetColumn() }}())"
 TokenPropertyRef_channel(t) ::= "(func() int { if <ctx(t)>.get<t.label; format={cap}>() == nil { return 0 } else { return <ctx(t)>.get<t.label; format={cap}>().GetChannel() }}())"
 TokenPropertyRef_index(t) ::= "(func() int { if <ctx(t)>.get<t.label; format={cap}>() == nil { return 0 } else { return <ctx(t)>.get<t.label; format={cap}>().GetTokenIndex() }}())"
-TokenPropertyRef_int(t) ::= "(func() int { if <ctx(t)>.get<t.label; format={cap}>() == nil { return 0 } else { return strconv.Atoi(<ctx(t)>.get<t.label; format={cap}>().GetText()) }}())"
+TokenPropertyRef_int(t) ::= "(func() int { if <ctx(t)>.get<t.label; format={cap}>() == nil { return 0 } else { i,_ := strconv.Atoi(<ctx(t)>.get<t.label; format={cap}>().GetText()); return i }}())"
 
 RulePropertyRef_start(r) ::= "(func() antlr4.Token { if <ctx(r)>.get<r.label;format={cap}>() == nil { return nil } else { return <ctx(r)>.get<r.label;format={cap}>().GetStart() }}())"
 RulePropertyRef_stop(r)	 ::= "(func() antlr4.Token { if <ctx(r)>.get<r.label;format={cap}>() == nil { return nil } else { return <ctx(r)>.get<r.label;format={cap}>().GetStop() }}())"
@@ -657,7 +657,7 @@ fail: ContextRuleListGetterDecl should never be called!
 >>
 
 ContextRuleListIndexedGetterDecl(r)   ::= <<
-<r.name; format="cap">(i int) []*<r.ctxName> {
+<r.name>(i int) []*<r.ctxName> {
     var ts []antlr4.RuleContext;
 
     if i \< 0 {