diff --git a/library/src/layout/mod.rs b/library/src/layout/mod.rs
index 047d78f9d..30c424bcc 100644
--- a/library/src/layout/mod.rs
+++ b/library/src/layout/mod.rs
@@ -58,7 +58,7 @@ impl LayoutRoot for Content {
         #[comemo::memoize]
         fn cached(
             node: &Content,
-            world: comemo::Tracked<dyn World>,
+            world: Tracked<dyn World>,
             provider: TrackedMut<StabilityProvider>,
             introspector: Tracked<Introspector>,
             styles: StyleChain,
@@ -104,7 +104,7 @@ impl Layout for Content {
         #[comemo::memoize]
         fn cached(
             node: &Content,
-            world: comemo::Tracked<dyn World>,
+            world: Tracked<dyn World>,
             provider: TrackedMut<StabilityProvider>,
             introspector: Tracked<Introspector>,
             styles: StyleChain,
diff --git a/src/diag.rs b/src/diag.rs
index 29e43b918..e244ba7ce 100644
--- a/src/diag.rs
+++ b/src/diag.rs
@@ -38,7 +38,7 @@ macro_rules! __error {
     };
 
     ($span:expr, $fmt:expr, $($arg:expr),+ $(,)?) => {
-        $crate::diag::error!($span, format!($fmt, $($arg),+))
+        $crate::diag::error!($span, $crate::util::format_eco!($fmt, $($arg),+))
     };
 }