diff --git a/src/agent/onefuzz-task/src/tasks/analysis/generic.rs b/src/agent/onefuzz-task/src/tasks/analysis/generic.rs
index 131948b4d..88bccc923 100644
--- a/src/agent/onefuzz-task/src/tasks/analysis/generic.rs
+++ b/src/agent/onefuzz-task/src/tasks/analysis/generic.rs
@@ -60,7 +60,7 @@ impl GetExpand for Config {
             .output_dir(&self.analysis.local_path)
             .set_optional(self.tools.clone().map(|t| t.local_path), Expand::tools_dir)
             .set_optional_ref(&self.reports, |expand, reports| {
-                expand.reports_dir(&reports.local_path.as_path())
+                expand.reports_dir(reports.local_path.as_path())
             })
             .set_optional_ref(&self.crashes, |expand, crashes| {
                 expand
@@ -350,7 +350,7 @@ mod tests {
             let params = config.get_expand_fields();
 
             for (param, expected) in params.iter() {
-                let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap();
+                let evaluated = expand.evaluate_value(param.get_string()).unwrap();
                 assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
             }
         }
diff --git a/src/agent/onefuzz-task/src/tasks/config.rs b/src/agent/onefuzz-task/src/tasks/config.rs
index af864a20a..0abc55497 100644
--- a/src/agent/onefuzz-task/src/tasks/config.rs
+++ b/src/agent/onefuzz-task/src/tasks/config.rs
@@ -454,7 +454,7 @@ mod tests {
             let params = config.get_expand_fields();
 
             for (param, expected) in params.iter() {
-                let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap();
+                let evaluated = expand.evaluate_value(param.get_string()).unwrap();
                 assert_eq!(evaluated, *expected);
             }
         }
diff --git a/src/agent/onefuzz-task/src/tasks/coverage/dotnet.rs b/src/agent/onefuzz-task/src/tasks/coverage/dotnet.rs
index 017f91c5d..160eeb4f2 100644
--- a/src/agent/onefuzz-task/src/tasks/coverage/dotnet.rs
+++ b/src/agent/onefuzz-task/src/tasks/coverage/dotnet.rs
@@ -515,7 +515,7 @@ mod tests {
             let params = config.get_expand_fields();
 
             for (param, expected) in params.iter() {
-                let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap();
+                let evaluated = expand.evaluate_value(param.get_string()).unwrap();
                 assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
             }
         }
diff --git a/src/agent/onefuzz-task/src/tasks/coverage/generic.rs b/src/agent/onefuzz-task/src/tasks/coverage/generic.rs
index 9ee1d2a23..d0eb31745 100644
--- a/src/agent/onefuzz-task/src/tasks/coverage/generic.rs
+++ b/src/agent/onefuzz-task/src/tasks/coverage/generic.rs
@@ -644,7 +644,7 @@ mod tests {
             let params = config.get_expand_fields();
 
             for (param, expected) in params.iter() {
-                let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap();
+                let evaluated = expand.evaluate_value(param.get_string()).unwrap();
                 assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
             }
         }
diff --git a/src/agent/onefuzz-task/src/tasks/fuzz/generator.rs b/src/agent/onefuzz-task/src/tasks/fuzz/generator.rs
index 60edb4b9a..d6faebb1a 100644
--- a/src/agent/onefuzz-task/src/tasks/fuzz/generator.rs
+++ b/src/agent/onefuzz-task/src/tasks/fuzz/generator.rs
@@ -287,7 +287,7 @@ mod tests {
             let params = config.get_expand_fields();
 
             for (param, expected) in params.iter() {
-                let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap();
+                let evaluated = expand.evaluate_value(param.get_string()).unwrap();
                 assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
             }
         }
diff --git a/src/agent/onefuzz-task/src/tasks/fuzz/supervisor.rs b/src/agent/onefuzz-task/src/tasks/fuzz/supervisor.rs
index 8a73bd809..707297b16 100644
--- a/src/agent/onefuzz-task/src/tasks/fuzz/supervisor.rs
+++ b/src/agent/onefuzz-task/src/tasks/fuzz/supervisor.rs
@@ -74,7 +74,7 @@ impl GetExpand for SupervisorConfig {
                 expand.input_marker(input_marker)
             })
             .set_optional_ref(&self.target_options, |expand, target_options| {
-                expand.target_options(&target_options)
+                expand.target_options(target_options)
             })
             .set_optional_ref(&self.tools, |expand, tools| {
                 expand.tools_dir(&tools.local_path)
@@ -301,7 +301,7 @@ async fn start_supervisor(
             expand.crashdumps(&crashdumps.local_path)
         })
         .set_optional_ref(&target_exe, |expand, target_exe| {
-            expand.target_exe(&target_exe)
+            expand.target_exe(target_exe)
         });
 
     let supervisor_path = expand.evaluate_value(&config.supervisor_exe)?;
@@ -360,7 +360,7 @@ mod tests {
             if let Some(target_exe) = &self.target_exe {
                 params.push((
                     PlaceHolder::TargetExe,
-                    dunce::canonicalize(&target_exe)
+                    dunce::canonicalize(target_exe)
                         .unwrap()
                         .to_string_lossy()
                         .to_string(),
@@ -431,7 +431,7 @@ mod tests {
             let params = config.get_expand_fields();
 
             for (param, expected) in params.iter() {
-                let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap();
+                let evaluated = expand.evaluate_value(param.get_string()).unwrap();
                 assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
             }
         }
diff --git a/src/agent/onefuzz-task/src/tasks/merge/generic.rs b/src/agent/onefuzz-task/src/tasks/merge/generic.rs
index ae8ef45af..a582ec8bc 100644
--- a/src/agent/onefuzz-task/src/tasks/merge/generic.rs
+++ b/src/agent/onefuzz-task/src/tasks/merge/generic.rs
@@ -244,7 +244,7 @@ mod tests {
             let params = config.get_expand_fields();
 
             for (param, expected) in params.iter() {
-                let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap();
+                let evaluated = expand.evaluate_value(param.get_string()).unwrap();
                 assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
             }
         }
diff --git a/src/agent/onefuzz-task/src/tasks/report/dotnet/generic.rs b/src/agent/onefuzz-task/src/tasks/report/dotnet/generic.rs
index 046866476..e9905f687 100644
--- a/src/agent/onefuzz-task/src/tasks/report/dotnet/generic.rs
+++ b/src/agent/onefuzz-task/src/tasks/report/dotnet/generic.rs
@@ -60,7 +60,7 @@ pub struct Config {
 }
 
 impl GetExpand for Config {
-    fn get_expand<'a>(&'a self) -> Result<Expand<'a>> {
+    fn get_expand(&self) -> Result<Expand<'_>> {
         let tools_dir = self.tools.local_path.to_string_lossy().into_owned();
 
         Ok(self
@@ -70,7 +70,7 @@ impl GetExpand for Config {
             .target_options(&self.target_options)
             .tools_dir(tools_dir)
             .set_optional_ref(&self.reports, |expand, reports| {
-                expand.reports_dir(&reports.local_path.as_path())
+                expand.reports_dir(reports.local_path.as_path())
             })
             .set_optional_ref(&self.crashes, |expand, crashes| {
                 expand
@@ -359,7 +359,7 @@ mod tests {
             let params = config.get_expand_fields();
 
             for (param, expected) in params.iter() {
-                let evaluated = expand.evaluate_value(format!("{}", param.get_string())).unwrap();
+                let evaluated = expand.evaluate_value(param.get_string()).unwrap();
                 assert_eq!(evaluated, *expected, "placeholder {} did not match expected value", param.get_string());
             }
         }