diff --git a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs
index f75c9476dfa1eb853836cfbecb6c204f7a29e7c3..ff6fba203dae0be7b9ded4f4cee66052c9d1da8d 100644
--- a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs
+++ b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs
@@ -594,9 +594,6 @@ public bool IsSimpleArgument(SyntaxNode node)
                    argument.NameColon == null;
         }
 
-        public bool IsTypeArgumentList(SyntaxNode node)
-            => node.IsKind(SyntaxKind.TypeArgumentList);
-
         public bool IsTypeConstraint(SyntaxNode node)
             => node.IsKind(SyntaxKind.TypeConstraint);
 
diff --git a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs
index 7c240c35a10bc0c755b69cb86d0067405bcc448a..a1b48398fa606ddfbbb42078ca15b248a58ec0a6 100644
--- a/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs
+++ b/src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs
@@ -60,5 +60,7 @@ public override TSyntaxKind Convert<TSyntaxKind>(int kind)
 
         public override int Parameter => (int)SyntaxKind.Parameter;
         public override int VariableDeclarator => (int)SyntaxKind.VariableDeclarator;
+
+        public override int TypeArgumentList => (int)SyntaxKind.TypeArgumentList;
     }
 }
diff --git a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs
index 53e3769488357d83a131812138db98d639083487..07746789a38c9b8f242e1aadec2e4600542200a0 100644
--- a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs
+++ b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs
@@ -651,6 +651,9 @@ public bool IsParameter([NotNullWhen(true)] SyntaxNode node)
         public bool IsVariableDeclarator([NotNullWhen(true)] SyntaxNode node)
             => node?.RawKind == SyntaxKinds.VariableDeclarator;
 
+        public bool IsTypeArgumentList([NotNullWhen(true)] SyntaxNode node)
+            => node?.RawKind == SyntaxKinds.TypeArgumentList;
+
 #nullable restore
     }
 }
diff --git a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs
index 606cab28567481b26ab90c3d24d9a0587a95ce03..405080d23ca77538b1f00ff84d4b2c1f778b0c97 100644
--- a/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs
+++ b/src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs
@@ -66,6 +66,8 @@ internal interface ISyntaxKindsService : ILanguageService
 
         int Parameter { get; }
         int VariableDeclarator { get; }
+
+        int TypeArgumentList { get; }
     }
 
     internal abstract class AbstractSyntaxKindsService : ISyntaxKindsService
@@ -113,5 +115,7 @@ internal abstract class AbstractSyntaxKindsService : ISyntaxKindsService
 
         public abstract int Parameter { get; }
         public abstract int VariableDeclarator { get; }
+
+        public abstract int TypeArgumentList { get; }
     }
 }
diff --git a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb
index 8bfe04d5a95a17aa5fa8b71b900275f3d31d9517..e979677a6d9b649902edb854ba8c7f02d7ebce47 100644
--- a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb
+++ b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb
@@ -642,8 +642,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
             Return argument IsNot Nothing AndAlso Not argument.IsNamed AndAlso Not argument.IsOmitted
         End Function
 
-        Public Function IsTypeArgumentList(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsTypeArgumentList
-            Return node.IsKind(SyntaxKind.TypeArgumentList)
+        Private Function ISyntaxFacts_IsTypeArgumentList(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsTypeArgumentList
+            Return IsTypeArgumentList(node)
         End Function
 
         Public Function IsTypeConstraint(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsTypeConstraint
@@ -2076,7 +2076,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
         End Function
 
         Private Function ISyntaxFactsService_IsExpressionStatement(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsExpressionStatement
-            Return MyBase.IsExpressionStatement(node)
+            Return IsExpressionStatement(node)
         End Function
 
         Public Function IsUsingAliasDirective(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsUsingAliasDirective
diff --git a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb
index 2ff911f54df9fa653f373638687a83de8539a3f6..325084f0e45bf119e043a294483befc49ecd4e64 100644
--- a/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb
+++ b/src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb
@@ -59,5 +59,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageServices
 
         Public Overrides ReadOnly Property Parameter As Integer = SyntaxKind.Parameter
         Public Overrides ReadOnly Property VariableDeclarator As Integer = SyntaxKind.VariableDeclarator
+
+        Public Overrides ReadOnly Property TypeArgumentList As Integer = SyntaxKind.TypeArgumentList
     End Class
 End Namespace