diff --git a/components/layout_2020/formatting_contexts.rs b/components/layout_2020/formatting_contexts.rs
index 4eca72d4878..aa720ee5d9d 100644
--- a/components/layout_2020/formatting_contexts.rs
+++ b/components/layout_2020/formatting_contexts.rs
@@ -160,11 +160,9 @@ impl IndependentFormattingContext {
                 let content_sizes = &mut non_replaced.content_sizes;
                 let contents = &mut non_replaced.contents;
                 sizing::outer_inline(style, containing_block_writing_mode, || {
-                    content_sizes
-                        .get_or_insert_with(|| {
-                            contents.inline_content_sizes(layout_context, style.writing_mode)
-                        })
-                        .clone()
+                    *content_sizes.get_or_insert_with(|| {
+                        contents.inline_content_sizes(layout_context, style.writing_mode)
+                    })
                 })
             },
             Self::Replaced(replaced) => {
@@ -199,9 +197,9 @@ impl NonReplacedFormattingContext {
     pub fn inline_content_sizes(&mut self, layout_context: &LayoutContext) -> ContentSizes {
         let writing_mode = self.style.writing_mode;
         let contents = &mut self.contents;
-        self.content_sizes
+        *self
+            .content_sizes
             .get_or_insert_with(|| contents.inline_content_sizes(layout_context, writing_mode))
-            .clone()
     }
 }
 
diff --git a/components/layout_2020/table/layout.rs b/components/layout_2020/table/layout.rs
index a5d5a9d1014..f33d85e3b38 100644
--- a/components/layout_2020/table/layout.rs
+++ b/components/layout_2020/table/layout.rs
@@ -174,13 +174,13 @@ impl<'a> TableLayout<'a> {
                     .inline
                     .non_auto()
                     .and_then(|length_percentage| length_percentage.to_percentage())
-                    .unwrap_or_else(|| Percentage(0.));
+                    .unwrap_or(Percentage(0.));
                 let max_inline_size_percent = cell
                     .style
                     .max_box_size(writing_mode)
                     .inline
                     .and_then(|length_percentage| length_percentage.to_percentage())
-                    .unwrap_or_else(|| Percentage(f32::INFINITY));
+                    .unwrap_or(Percentage(f32::INFINITY));
                 let percentage_contribution =
                     Percentage(inline_size_percent.0.min(max_inline_size_percent.0));
 
@@ -649,7 +649,7 @@ impl<'a> TableLayout<'a> {
                 let resolved = self
                     .assignable_width
                     .scale_by(column_measure.percentage_width.0);
-                let percent_guess = min_content_width.max(resolved.into());
+                let percent_guess = min_content_width.max(resolved);
                 (percent_guess, percent_guess, percent_guess)
             } else if constrained {
                 (min_content_width, max_content_width, max_content_width)