diff --git a/src/IncrementalParserData.ts b/src/IncrementalParserData.ts
index 2fe6c48e..f28f3c4b 100644
--- a/src/IncrementalParserData.ts
+++ b/src/IncrementalParserData.ts
@@ -85,8 +85,8 @@ export enum TokenChangeType {
 }
 export interface TokenChange {
 	changeType: TokenChangeType;
-	oldToken?: CommonToken;
 	newToken?: CommonToken;
+	oldToken?: CommonToken;
 }
 
 /**
diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/TypeScript/TypeScript.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/TypeScript/TypeScript.stg
index 8b9c1c0e..4b5c19e9 100644
--- a/tool/resources/org/antlr/v4/tool/templates/codegen/TypeScript/TypeScript.stg
+++ b/tool/resources/org/antlr/v4/tool/templates/codegen/TypeScript/TypeScript.stg
@@ -294,7 +294,7 @@ RuleFunction(currentRule,args,code,locals,ruleCtx,altLabelCtxs,namedActions,fina
 // @RuleVersion(<namedActions.version; null="0">)
 <if(currentRule.modifiers)><currentRule.modifiers:{f | <f> }><else>public <endif><currentRule.name>(<args; separator=",">): <currentRule.ctxType> {
 	<if(file.factory.grammar.ast.cmdLineOptions.("incremental"))>
-	// Check whether we need to execute this rule.	
+	// Check whether we need to execute this rule.
 	let guardResult = this.guardRule(this._ctx as IncrementalParserRuleContext, this.state, <parser.name>.RULE_<currentRule.name>) as <currentRule.ctxType>;
 	// If we found an existing context that is valid, return it.
 	if (guardResult) {
@@ -418,7 +418,7 @@ LeftRecursiveRuleFunction(currentRule,args,code,locals,ruleCtx,altLabelCtxs,
 	let _parentctx: ParserRuleContext = this._ctx;
 	let _parentState: number = this.state;
 	<if(file.factory.grammar.ast.cmdLineOptions.("incremental"))>
-	// Check whether we need to execute this rule.	
+	// Check whether we need to execute this rule.
 	let guardResult = this.guardRule(this._ctx as IncrementalParserRuleContext, _parentState, <parser.name>.RULE_<currentRule.name>) as <currentRule.ctxType>;
 	// If we found an existing context that is valid, return it.
 	if (guardResult) {