diff --git a/lib/galaxy/tools/execute.py b/lib/galaxy/tools/execute.py
index 121c3d311602..aef512f61f37 100644
--- a/lib/galaxy/tools/execute.py
+++ b/lib/galaxy/tools/execute.py
@@ -259,7 +259,14 @@ def __init__(
 
 
 class ExecutionTracker:
-    def __init__(self, trans, tool, mapping_params, collection_info, completed_jobs=None):
+    def __init__(
+        self,
+        trans,
+        tool: "Tool",
+        mapping_params: MappingParameters,
+        collection_info: Optional[MatchingCollections],
+        completed_jobs: Optional[CompletedJobsT] = None,
+    ):
         # Known ahead of time...
         self.trans = trans
         self.tool = tool
@@ -574,7 +581,14 @@ def new_collection_execution_slices(self):
 # Seperate these because workflows need to track their jobs belong to the invocation
 # in the database immediately and they can be recovered.
 class ToolExecutionTracker(ExecutionTracker):
-    def __init__(self, trans, tool, mapping_params, collection_info, completed_jobs=None):
+    def __init__(
+        self,
+        trans,
+        tool: "Tool",
+        mapping_params: MappingParameters,
+        collection_info: Optional[MatchingCollections],
+        completed_jobs: Optional[CompletedJobsT] = None,
+    ):
         super().__init__(trans, tool, mapping_params, collection_info, completed_jobs=completed_jobs)
 
         # New to track these things for tool output API response in the tool case,
@@ -606,7 +620,15 @@ def new_collection_execution_slices(self):
 
 
 class WorkflowStepExecutionTracker(ExecutionTracker):
-    def __init__(self, trans, tool, mapping_params, collection_info, invocation_step, completed_jobs=None):
+    def __init__(
+        self,
+        trans,
+        tool: "Tool",
+        mapping_params: MappingParameters,
+        collection_info: Optional[MatchingCollections],
+        invocation_step: model.WorkflowInvocationStep,
+        completed_jobs: Optional[CompletedJobsT] = None,
+    ):
         super().__init__(trans, tool, mapping_params, collection_info, completed_jobs=completed_jobs)
         self.invocation_step = invocation_step