diff --git a/src/svdsuite/process.py b/src/svdsuite/process.py
index 866322c..1d60f30 100644
--- a/src/svdsuite/process.py
+++ b/src/svdsuite/process.py
@@ -1,6 +1,7 @@
 import re
 import itertools
 import warnings
+from typing import TypeVar
 
 from svdsuite.parse import Parser
 from svdsuite.model.parse import (
@@ -51,8 +52,9 @@
 )
 from svdsuite.model.type_alias import ParsedDimablePeripheralTypes, IntermediateDimablePeripheralTypes
 
+T = TypeVar("T")
 
-def or_if_none[T](a: None | T, b: None | T) -> None | T:
+def or_if_none(a: None | T, b: None | T) -> None | T:
     return a if a is not None else b
 
 
diff --git a/src/svdsuite/resolve/logger.py b/src/svdsuite/resolve/logger.py
index a168db4..52e4582 100644
--- a/src/svdsuite/resolve/logger.py
+++ b/src/svdsuite/resolve/logger.py
@@ -1,5 +1,7 @@
 import itertools
-from typing import Any, Callable
+from typing import Any, Callable, TypeVar
+
+R = TypeVar("R")
 
 from svdsuite.resolve.graph import ResolverGraph
 from svdsuite.resolve.graph_elements import ElementNode
@@ -17,7 +19,7 @@ def __init__(self, resolver_logging_file_path: None | str, resolver_graph: Resol
             self._html_generator = HTMLGenerator(self._resolver_logging_file_path)
 
     @staticmethod
-    def _only_execute_if_logging_is_active[R](method: Callable[..., R]) -> Callable[..., R | None]:
+    def _only_execute_if_logging_is_active(method: Callable[..., R]) -> Callable[..., R | None]:
         def wrapper(self: "ResolverLogger", *args: Any, **kwargs: Any) -> R | None:
             if self._resolver_logging_file_path is None:  # pylint: disable=protected-access
                 return None