diff --git a/analyzers/src/SonarAnalyzer.CSharp/Extensions/SonarAnalysisContextExtensions.cs b/analyzers/src/SonarAnalyzer.CSharp/Extensions/SonarAnalysisContextExtensions.cs
index e649f853941..24a4347666a 100644
--- a/analyzers/src/SonarAnalyzer.CSharp/Extensions/SonarAnalysisContextExtensions.cs
+++ b/analyzers/src/SonarAnalyzer.CSharp/Extensions/SonarAnalysisContextExtensions.cs
@@ -18,45 +18,37 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace SonarAnalyzer.Extensions
+namespace SonarAnalyzer.Extensions;
+
+public static class SonarAnalysisContextExtensions
 {
-    internal static class SonarAnalysisContextExtensions
-    {
-        public static void RegisterNodeAction<TSyntaxKind>(this SonarAnalysisContext context,
-                                                                               Action<SonarSyntaxNodeReportingContext> action,
-                                                                               params TSyntaxKind[] syntaxKinds) where TSyntaxKind : struct =>
-            context.RegisterNodeAction(CSharpGeneratedCodeRecognizer.Instance, action, syntaxKinds);
+    public static void RegisterNodeAction(this SonarAnalysisContext context, Action<SonarSyntaxNodeReportingContext> action, params SyntaxKind[] syntaxKinds) =>
+        context.RegisterNodeAction(CSharpGeneratedCodeRecognizer.Instance, action, syntaxKinds);
 
-        public static void RegisterNodeAction<TSyntaxKind>(this SonarParametrizedAnalysisContext context,
-                                                                               Action<SonarSyntaxNodeReportingContext> action,
-                                                                               params TSyntaxKind[] syntaxKinds) where TSyntaxKind : struct =>
-            context.RegisterNodeAction(CSharpGeneratedCodeRecognizer.Instance, action, syntaxKinds);
+    public static void RegisterNodeAction(this SonarParametrizedAnalysisContext context, Action<SonarSyntaxNodeReportingContext> action, params SyntaxKind[] syntaxKinds) =>
+        context.RegisterNodeAction(CSharpGeneratedCodeRecognizer.Instance, action, syntaxKinds);
 
-        public static void RegisterNodeAction<TSyntaxKind>(this SonarCompilationStartAnalysisContext context,
-                                                                               Action<SonarSyntaxNodeReportingContext> action,
-                                                                               params TSyntaxKind[] syntaxKinds) where TSyntaxKind : struct =>
-            context.RegisterNodeAction(CSharpGeneratedCodeRecognizer.Instance, action, syntaxKinds);
+    public static void RegisterNodeAction(this SonarCompilationStartAnalysisContext context, Action<SonarSyntaxNodeReportingContext> action, params SyntaxKind[] syntaxKinds) =>
+        context.RegisterNodeAction(CSharpGeneratedCodeRecognizer.Instance, action, syntaxKinds);
 
-        public static void RegisterTreeAction(this SonarAnalysisContext context, Action<SonarSyntaxTreeReportingContext> action) =>
-            context.RegisterTreeAction(CSharpGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterTreeAction(this SonarAnalysisContext context, Action<SonarSyntaxTreeReportingContext> action) =>
+        context.RegisterTreeAction(CSharpGeneratedCodeRecognizer.Instance, action);
 
-        public static void RegisterTreeAction(this SonarParametrizedAnalysisContext context, Action<SonarSyntaxTreeReportingContext> action) =>
-            context.RegisterTreeAction(CSharpGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterTreeAction(this SonarParametrizedAnalysisContext context, Action<SonarSyntaxTreeReportingContext> action) =>
+        context.RegisterTreeAction(CSharpGeneratedCodeRecognizer.Instance, action);
 
-        public static void RegisterSemanticModelAction(this SonarParametrizedAnalysisContext context, Action<SonarSemanticModelReportingContext> action) =>
-            context.RegisterSemanticModelAction(CSharpGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterSemanticModelAction(this SonarParametrizedAnalysisContext context, Action<SonarSemanticModelReportingContext> action) =>
+        context.RegisterSemanticModelAction(CSharpGeneratedCodeRecognizer.Instance, action);
 
-        public static void RegisterSemanticModelAction(this SonarAnalysisContext context, Action<SonarSemanticModelReportingContext> action) =>
-            context.RegisterSemanticModelAction(CSharpGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterSemanticModelAction(this SonarAnalysisContext context, Action<SonarSemanticModelReportingContext> action) =>
+        context.RegisterSemanticModelAction(CSharpGeneratedCodeRecognizer.Instance, action);
 
-        public static void RegisterCodeBlockStartAction<TSyntaxKind>(this SonarAnalysisContext context, Action<SonarCodeBlockStartAnalysisContext<TSyntaxKind>> action)
-            where TSyntaxKind : struct =>
-            context.RegisterCodeBlockStartAction(CSharpGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterCodeBlockStartAction(this SonarAnalysisContext context, Action<SonarCodeBlockStartAnalysisContext<SyntaxKind>> action) =>
+        context.RegisterCodeBlockStartAction(CSharpGeneratedCodeRecognizer.Instance, action);
 
-        public static void ReportIssue(this SonarCompilationReportingContext context, Diagnostic diagnostic) =>
-            context.ReportIssue(CSharpGeneratedCodeRecognizer.Instance, diagnostic);
+    public static void ReportIssue(this SonarCompilationReportingContext context, Diagnostic diagnostic) =>
+        context.ReportIssue(CSharpGeneratedCodeRecognizer.Instance, diagnostic);
 
-        public static void ReportIssue(this SonarSymbolReportingContext context, Diagnostic diagnostic) =>
-            context.ReportIssue(CSharpGeneratedCodeRecognizer.Instance, diagnostic);
-    }
+    public static void ReportIssue(this SonarSymbolReportingContext context, Diagnostic diagnostic) =>
+        context.ReportIssue(CSharpGeneratedCodeRecognizer.Instance, diagnostic);
 }
diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/GetHashCodeEqualsOverride.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/GetHashCodeEqualsOverride.cs
index 6940d2635a1..631ddcead09 100644
--- a/analyzers/src/SonarAnalyzer.CSharp/Rules/GetHashCodeEqualsOverride.cs
+++ b/analyzers/src/SonarAnalyzer.CSharp/Rules/GetHashCodeEqualsOverride.cs
@@ -34,7 +34,7 @@ public sealed class GetHashCodeEqualsOverride : SonarDiagnosticAnalyzer
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; } = ImmutableArray.Create(Rule);
 
         protected override void Initialize(SonarAnalysisContext context) =>
-            context.RegisterCodeBlockStartAction<SyntaxKind>(
+            context.RegisterCodeBlockStartAction(
                 cb =>
                 {
                     if (!(cb.CodeBlock is MethodDeclarationSyntax methodDeclaration))
diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/GuardConditionOnEqualsOverride.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/GuardConditionOnEqualsOverride.cs
index e21710309b9..d025bc01393 100644
--- a/analyzers/src/SonarAnalyzer.CSharp/Rules/GuardConditionOnEqualsOverride.cs
+++ b/analyzers/src/SonarAnalyzer.CSharp/Rules/GuardConditionOnEqualsOverride.cs
@@ -33,7 +33,7 @@ public sealed class GuardConditionOnEqualsOverride : SonarDiagnosticAnalyzer
         private static readonly ISet<string> MethodNames = new HashSet<string> { GetHashCodeEqualsOverride.EqualsName };
 
         protected override void Initialize(SonarAnalysisContext context) =>
-            context.RegisterCodeBlockStartAction<SyntaxKind>(
+            context.RegisterCodeBlockStartAction(
                 cb =>
                 {
                     if (!(cb.OwningSymbol is IMethodSymbol methodSymbol)
diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/StaticFieldWrittenFrom.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/StaticFieldWrittenFrom.cs
index 490e92bdd8c..d0eb84f7e86 100644
--- a/analyzers/src/SonarAnalyzer.CSharp/Rules/StaticFieldWrittenFrom.cs
+++ b/analyzers/src/SonarAnalyzer.CSharp/Rules/StaticFieldWrittenFrom.cs
@@ -30,7 +30,7 @@ public abstract class StaticFieldWrittenFrom : SonarDiagnosticAnalyzer
         public sealed override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);
 
         protected sealed override void Initialize(SonarAnalysisContext context) =>
-            context.RegisterCodeBlockStartAction<SyntaxKind>(cbc =>
+            context.RegisterCodeBlockStartAction(cbc =>
                 {
                     if (!IsValidCodeBlockContext(cbc.CodeBlock, cbc.OwningSymbol))
                     {
diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/ThisShouldNotBeExposedFromConstructors.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/ThisShouldNotBeExposedFromConstructors.cs
index e42115787cb..13189c72b40 100644
--- a/analyzers/src/SonarAnalyzer.CSharp/Rules/ThisShouldNotBeExposedFromConstructors.cs
+++ b/analyzers/src/SonarAnalyzer.CSharp/Rules/ThisShouldNotBeExposedFromConstructors.cs
@@ -33,7 +33,7 @@ public sealed class ThisShouldNotBeExposedFromConstructors : SonarDiagnosticAnal
 
         protected override void Initialize(SonarAnalysisContext context)
         {
-            context.RegisterCodeBlockStartAction<SyntaxKind>(
+            context.RegisterCodeBlockStartAction(
                 cbc =>
                 {
                     if (!IsInstanceConstructor(cbc.CodeBlock))
diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/VariableUnused.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/VariableUnused.cs
index 184ea8defe1..9ecd4bcf057 100644
--- a/analyzers/src/SonarAnalyzer.CSharp/Rules/VariableUnused.cs
+++ b/analyzers/src/SonarAnalyzer.CSharp/Rules/VariableUnused.cs
@@ -28,7 +28,7 @@ public sealed class VariableUnused : VariableUnusedBase
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; } = ImmutableArray.Create(Rule);
 
         protected override void Initialize(SonarAnalysisContext context) =>
-            context.RegisterCodeBlockStartAction<SyntaxKind>(cbc =>
+            context.RegisterCodeBlockStartAction(cbc =>
             {
                 var collector = new UnusedLocalsCollector();
 
diff --git a/analyzers/src/SonarAnalyzer.VisualBasic/Extensions/SonarAnalysisContextExtensions.cs b/analyzers/src/SonarAnalyzer.VisualBasic/Extensions/SonarAnalysisContextExtensions.cs
index 58baed901fd..e0dc15996af 100644
--- a/analyzers/src/SonarAnalyzer.VisualBasic/Extensions/SonarAnalysisContextExtensions.cs
+++ b/analyzers/src/SonarAnalyzer.VisualBasic/Extensions/SonarAnalysisContextExtensions.cs
@@ -18,45 +18,37 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-namespace SonarAnalyzer.Extensions
+namespace SonarAnalyzer.Extensions;
+
+public static class SonarAnalysisContextExtensions
 {
-    public static class SonarAnalysisContextExtensions
-    {
-        public static void RegisterNodeAction<TSyntaxKind>(this SonarAnalysisContext context,
-                                                                               Action<SonarSyntaxNodeReportingContext> action,
-                                                                               params TSyntaxKind[] syntaxKinds) where TSyntaxKind : struct =>
-            context.RegisterNodeAction(VisualBasicGeneratedCodeRecognizer.Instance, action, syntaxKinds);
+    public static void RegisterNodeAction(this SonarAnalysisContext context, Action<SonarSyntaxNodeReportingContext> action, params SyntaxKind[] syntaxKinds) =>
+        context.RegisterNodeAction(VisualBasicGeneratedCodeRecognizer.Instance, action, syntaxKinds);
 
-        public static void RegisterNodeAction<TSyntaxKind>(this SonarParametrizedAnalysisContext context,
-                                                                               Action<SonarSyntaxNodeReportingContext> action,
-                                                                               params TSyntaxKind[] syntaxKinds) where TSyntaxKind : struct =>
-            context.RegisterNodeAction(VisualBasicGeneratedCodeRecognizer.Instance, action, syntaxKinds);
+    public static void RegisterNodeAction(this SonarParametrizedAnalysisContext context, Action<SonarSyntaxNodeReportingContext> action, params SyntaxKind[] syntaxKinds) =>
+        context.RegisterNodeAction(VisualBasicGeneratedCodeRecognizer.Instance, action, syntaxKinds);
 
-        public static void RegisterNodeAction<TSyntaxKind>(this SonarCompilationStartAnalysisContext context,
-                                                                               Action<SonarSyntaxNodeReportingContext> action,
-                                                                               params TSyntaxKind[] syntaxKinds) where TSyntaxKind : struct =>
-            context.RegisterNodeAction(VisualBasicGeneratedCodeRecognizer.Instance, action, syntaxKinds);
+    public static void RegisterNodeAction(this SonarCompilationStartAnalysisContext context, Action<SonarSyntaxNodeReportingContext> action, params SyntaxKind[] syntaxKinds) =>
+        context.RegisterNodeAction(VisualBasicGeneratedCodeRecognizer.Instance, action, syntaxKinds);
 
-        public static void RegisterTreeAction(this SonarAnalysisContext context, Action<SonarSyntaxTreeReportingContext> action) =>
-            context.RegisterTreeAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterTreeAction(this SonarAnalysisContext context, Action<SonarSyntaxTreeReportingContext> action) =>
+        context.RegisterTreeAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
 
-        public static void RegisterTreeAction(this SonarParametrizedAnalysisContext context, Action<SonarSyntaxTreeReportingContext> action) =>
-            context.RegisterTreeAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterTreeAction(this SonarParametrizedAnalysisContext context, Action<SonarSyntaxTreeReportingContext> action) =>
+        context.RegisterTreeAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
 
-        public static void RegisterSemanticModelAction(this SonarAnalysisContext context, Action<SonarSemanticModelReportingContext> action) =>
-            context.RegisterSemanticModelAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterSemanticModelAction(this SonarAnalysisContext context, Action<SonarSemanticModelReportingContext> action) =>
+        context.RegisterSemanticModelAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
 
-        public static void RegisterSemanticModelAction(this SonarParametrizedAnalysisContext context, Action<SonarSemanticModelReportingContext> action) =>
-            context.RegisterSemanticModelAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterSemanticModelAction(this SonarParametrizedAnalysisContext context, Action<SonarSemanticModelReportingContext> action) =>
+        context.RegisterSemanticModelAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
 
-        public static void RegisterCodeBlockStartAction<TSyntaxKind>(this SonarAnalysisContext context, Action<SonarCodeBlockStartAnalysisContext<TSyntaxKind>> action)
-            where TSyntaxKind : struct =>
-            context.RegisterCodeBlockStartAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
+    public static void RegisterCodeBlockStartAction(this SonarAnalysisContext context, Action<SonarCodeBlockStartAnalysisContext<SyntaxKind>> action) =>
+        context.RegisterCodeBlockStartAction(VisualBasicGeneratedCodeRecognizer.Instance, action);
 
-        public static void ReportIssue(this SonarCompilationReportingContext context, Diagnostic diagnostic) =>
-            context.ReportIssue(VisualBasicGeneratedCodeRecognizer.Instance, diagnostic);
+    public static void ReportIssue(this SonarCompilationReportingContext context, Diagnostic diagnostic) =>
+        context.ReportIssue(VisualBasicGeneratedCodeRecognizer.Instance, diagnostic);
 
-        public static void ReportIssue(this SonarSymbolReportingContext context, Diagnostic diagnostic) =>
-            context.ReportIssue(VisualBasicGeneratedCodeRecognizer.Instance, diagnostic);
-    }
+    public static void ReportIssue(this SonarSymbolReportingContext context, Diagnostic diagnostic) =>
+        context.ReportIssue(VisualBasicGeneratedCodeRecognizer.Instance, diagnostic);
 }
diff --git a/analyzers/src/SonarAnalyzer.VisualBasic/Rules/VariableUnused.cs b/analyzers/src/SonarAnalyzer.VisualBasic/Rules/VariableUnused.cs
index fef3da85df1..7721c914389 100644
--- a/analyzers/src/SonarAnalyzer.VisualBasic/Rules/VariableUnused.cs
+++ b/analyzers/src/SonarAnalyzer.VisualBasic/Rules/VariableUnused.cs
@@ -28,7 +28,7 @@ public sealed class VariableUnused : VariableUnusedBase
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; } = ImmutableArray.Create(Rule);
 
         protected override void Initialize(SonarAnalysisContext context) =>
-            context.RegisterCodeBlockStartAction<SyntaxKind>(cbc =>
+            context.RegisterCodeBlockStartAction(cbc =>
             {
                 var collector = new UnusedLocalsCollector();