diff --git a/components/salsa-macro-rules/src/setup_tracked_fn.rs b/components/salsa-macro-rules/src/setup_tracked_fn.rs
index accffbf4..7f57c406 100644
--- a/components/salsa-macro-rules/src/setup_tracked_fn.rs
+++ b/components/salsa-macro-rules/src/setup_tracked_fn.rs
@@ -32,7 +32,7 @@ macro_rules! setup_tracked_fn {
         output_ty: $output_ty:ty,
 
         // Function body, may reference identifiers defined in `$input_pats` and the generics from `$generics`
-        inner_fn: $inner_fn:item,
+        inner_fn: {$($inner_fn:tt)*},
 
         // Path to the cycle recovery function to use.
         cycle_recovery_fn: ($($cycle_recovery_fn:tt)*),
@@ -172,7 +172,7 @@ macro_rules! setup_tracked_fn {
                 }
 
                 fn execute<$db_lt>($db: &$db_lt Self::DbView, ($($input_id),*): ($($input_ty),*)) -> Self::Output<$db_lt> {
-                    $inner_fn
+                    $($inner_fn)*
 
                     $inner($db, $($input_id),*)
                 }
diff --git a/components/salsa-macros/src/tracked_fn.rs b/components/salsa-macros/src/tracked_fn.rs
index 57023ef2..a59072ef 100644
--- a/components/salsa-macros/src/tracked_fn.rs
+++ b/components/salsa-macros/src/tracked_fn.rs
@@ -125,7 +125,7 @@ impl Macro {
                 input_ids: [#(#input_ids),*],
                 input_tys: [#(#input_tys),*],
                 output_ty: #output_ty,
-                inner_fn: #inner_fn,
+                inner_fn: { #inner_fn },
                 cycle_recovery_fn: #cycle_recovery_fn,
                 cycle_recovery_strategy: #cycle_recovery_strategy,
                 is_specifiable: #is_specifiable,