diff --git a/tool/test/org/antlr/v4/test/TestTokenPositionOptions.java b/tool/test/org/antlr/v4/test/TestTokenPositionOptions.java
index ee2008f9c..3aa97d5d4 100644
--- a/tool/test/org/antlr/v4/test/TestTokenPositionOptions.java
+++ b/tool/test/org/antlr/v4/test/TestTokenPositionOptions.java
@@ -61,19 +61,19 @@ public class TestTokenPositionOptions extends BaseTest {
 		assertEquals(expectedTree, g.ast.toStringTree());
 
 		String expectedElementTokens =
-				"[@5,11:11='s',<56>,2:0]\n" +
-				"[@9,15:15='e',<56>,2:4]\n" +
-				"[@11,17:19='';'',<61>,2:6]\n" +
-				"[@15,23:23='e',<56>,3:0]\n" +
-				"[@43,64:66=''-'',<61>,6:4]\n" +
-				"[@45,68:68='e',<56>,6:8]\n" +
-				"[@49,74:75='ID',<65>,7:4]\n" +
-				"[@21,29:31=''*'',<61>,3:6]\n" +
-				"[@23,33:33='e',<56>,3:10]\n" +
-				"[@29,41:43=''+'',<61>,4:6]\n" +
-				"[@31,45:45='e',<56>,4:10]\n" +
-				"[@37,53:55=''.'',<61>,5:6]\n" +
-				"[@39,57:58='ID',<65>,5:10]";
+				"[@5,11:11='s',<57>,2:0]\n" +
+				"[@9,15:15='e',<57>,2:4]\n" +
+				"[@11,17:19='';'',<62>,2:6]\n" +
+				"[@15,23:23='e',<57>,3:0]\n" +
+				"[@43,64:66=''-'',<62>,6:4]\n" +
+				"[@45,68:68='e',<57>,6:8]\n" +
+				"[@49,74:75='ID',<66>,7:4]\n" +
+				"[@21,29:31=''*'',<62>,3:6]\n" +
+				"[@23,33:33='e',<57>,3:10]\n" +
+				"[@29,41:43=''+'',<62>,4:6]\n" +
+				"[@31,45:45='e',<57>,4:10]\n" +
+				"[@37,53:55=''.'',<62>,5:6]\n" +
+				"[@39,57:58='ID',<66>,5:10]";
 
 		IntervalSet types =
 				new IntervalSet(ANTLRParser.TOKEN_REF,
@@ -105,19 +105,19 @@ public class TestTokenPositionOptions extends BaseTest {
 		assertEquals(expectedTree, g.ast.toStringTree());
 
 		String expectedElementTokens =
-				"[@5,11:11='s',<56>,2:0]\n" +
-				"[@9,15:15='e',<56>,2:4]\n" +
-				"[@11,17:19='';'',<61>,2:6]\n" +
-				"[@15,23:23='e',<56>,3:0]\n" +
-				"[@47,68:70=''-'',<61>,6:4]\n" +
-				"[@49,72:72='e',<56>,6:8]\n" +
-				"[@53,78:79='ID',<65>,7:4]\n" +
-				"[@21,29:31=''*'',<61>,3:6]\n" +
-				"[@25,35:35='e',<56>,3:12]\n" +
-				"[@31,43:45=''+'',<61>,4:6]\n" +
-				"[@33,47:47='e',<56>,4:10]\n" +
-				"[@39,55:57=''.'',<61>,5:6]\n" +
-				"[@43,61:62='ID',<65>,5:12]";
+				"[@5,11:11='s',<57>,2:0]\n" +
+				"[@9,15:15='e',<57>,2:4]\n" +
+				"[@11,17:19='';'',<62>,2:6]\n" +
+				"[@15,23:23='e',<57>,3:0]\n" +
+				"[@47,68:70=''-'',<62>,6:4]\n" +
+				"[@49,72:72='e',<57>,6:8]\n" +
+				"[@53,78:79='ID',<66>,7:4]\n" +
+				"[@21,29:31=''*'',<62>,3:6]\n" +
+				"[@25,35:35='e',<57>,3:12]\n" +
+				"[@31,43:45=''+'',<62>,4:6]\n" +
+				"[@33,47:47='e',<57>,4:10]\n" +
+				"[@39,55:57=''.'',<62>,5:6]\n" +
+				"[@43,61:62='ID',<66>,5:12]";
 
 		IntervalSet types =
 				new IntervalSet(ANTLRParser.TOKEN_REF,
@@ -149,20 +149,20 @@ public class TestTokenPositionOptions extends BaseTest {
 		assertEquals(expectedTree, g.ast.toStringTree());
 
 		String expectedElementTokens =
-				"[@5,11:11='s',<56>,2:0]\n" +
-				"[@9,15:15='e',<56>,2:4]\n" +
-				"[@11,17:19='';'',<61>,2:6]\n" +
-				"[@15,23:23='e',<56>,3:0]\n" +
-				"[@49,73:75=''-'',<61>,6:4]\n" +
-				"[@51,77:77='e',<56>,6:8]\n" +
-				"[@55,83:84='ID',<65>,7:4]\n" +
-				"[@24,33:35=''*'',<61>,3:10]\n" +
-				"[@26,37:39=''/'',<61>,3:14]\n" +
-				"[@29,42:42='e',<56>,3:19]\n" +
-				"[@35,50:52=''+'',<61>,4:6]\n" +
-				"[@37,54:54='e',<56>,4:10]\n" +
-				"[@43,62:64=''.'',<61>,5:6]\n" +
-				"[@45,66:67='ID',<65>,5:10]";
+				"[@5,11:11='s',<57>,2:0]\n" +
+				"[@9,15:15='e',<57>,2:4]\n" +
+				"[@11,17:19='';'',<62>,2:6]\n" +
+				"[@15,23:23='e',<57>,3:0]\n" +
+				"[@49,73:75=''-'',<62>,6:4]\n" +
+				"[@51,77:77='e',<57>,6:8]\n" +
+				"[@55,83:84='ID',<66>,7:4]\n" +
+				"[@24,33:35=''*'',<62>,3:10]\n" +
+				"[@26,37:39=''/'',<62>,3:14]\n" +
+				"[@29,42:42='e',<57>,3:19]\n" +
+				"[@35,50:52=''+'',<62>,4:6]\n" +
+				"[@37,54:54='e',<57>,4:10]\n" +
+				"[@43,62:64=''.'',<62>,5:6]\n" +
+				"[@45,66:67='ID',<66>,5:10]";
 
 		IntervalSet types =
 				new IntervalSet(ANTLRParser.TOKEN_REF,