diff --git a/components/layout/floats.rs b/components/layout/floats.rs
index 44704b22230..4ef48fe8a7a 100644
--- a/components/layout/floats.rs
+++ b/components/layout/floats.rs
@@ -56,14 +56,14 @@ struct FloatList {
     /// Information about each of the floats here.
     floats: PersistentList<Float>,
     /// Cached copy of the maximum block-start offset of the float.
-    max_block_start: Au,
+    max_block_start: Option<Au>,
 }
 
 impl FloatList {
     fn new() -> FloatList {
         FloatList {
             floats: PersistentList::new(),
-            max_block_start: Au(0),
+            max_block_start: None,
         }
     }
 
@@ -247,15 +247,15 @@ impl Floats {
 
     /// Adds a new float to the list.
     pub fn add_float(&mut self, info: &PlacementInfo) {
-        let new_info;
-        {
-            new_info = PlacementInfo {
-                size: info.size,
-                ceiling: max(info.ceiling, self.list.max_block_start + self.offset.block),
-                max_inline_size: info.max_inline_size,
-                kind: info.kind
-            }
-        }
+        let new_info = PlacementInfo {
+            size: info.size,
+            ceiling: match self.list.max_block_start {
+                None => info.ceiling,
+                Some(max_block_start) => max(info.ceiling, max_block_start + self.offset.block),
+            },
+            max_inline_size: info.max_inline_size,
+            kind: info.kind
+        };
 
         debug!("add_float: added float with info {:?}", new_info);
 
@@ -269,7 +269,10 @@ impl Floats {
         };
 
         self.list.floats = self.list.floats.prepend_elem(new_float);
-        self.list.max_block_start = max(self.list.max_block_start, new_float.bounds.start.b);
+        self.list.max_block_start = match self.list.max_block_start {
+            None => Some(new_float.bounds.start.b),
+            Some(max_block_start) => Some(max(max_block_start, new_float.bounds.start.b)),
+        }
     }
 
     /// Given the three sides of the bounding rectangle in the block-start direction, finds the
diff --git a/components/layout/model.rs b/components/layout/model.rs
index 6312bf3d30b..baacc756454 100644
--- a/components/layout/model.rs
+++ b/components/layout/model.rs
@@ -114,8 +114,8 @@ impl MarginCollapseInfo {
     }
 
     pub fn initialize_block_start_margin(&mut self,
-                                 fragment: &Fragment,
-                                 can_collapse_block_start_margin_with_kids: bool) {
+                                         fragment: &Fragment,
+                                         can_collapse_block_start_margin_with_kids: bool) {
         if !can_collapse_block_start_margin_with_kids {
             self.state = MarginCollapseState::AccumulatingMarginIn
         }
@@ -239,25 +239,31 @@ impl MarginCollapseInfo {
     /// Adds the child's potentially collapsible block-end margin to the current margin state and
     /// advances the Y offset by the appropriate amount to handle that margin. Returns the amount
     /// that should be added to the Y offset during block layout.
-    pub fn advance_block_end_margin(&mut self, child_collapsible_margins: &CollapsibleMargins) -> Au {
+    pub fn advance_block_end_margin(&mut self, child_collapsible_margins: &CollapsibleMargins)
+                                    -> Au {
         match (self.state, *child_collapsible_margins) {
             (MarginCollapseState::AccumulatingCollapsibleTopMargin, CollapsibleMargins::None(..)) |
-            (MarginCollapseState::AccumulatingCollapsibleTopMargin, CollapsibleMargins::Collapse(..)) => {
+            (MarginCollapseState::AccumulatingCollapsibleTopMargin,
+             CollapsibleMargins::Collapse(..)) => {
                 // Can't happen because the state will have been replaced with
                 // `MarginCollapseState::AccumulatingMarginIn` above.
                 panic!("should not be accumulating collapsible block_start margins anymore!")
             }
-            (MarginCollapseState::AccumulatingCollapsibleTopMargin, CollapsibleMargins::CollapseThrough(margin)) => {
+            (MarginCollapseState::AccumulatingCollapsibleTopMargin,
+             CollapsibleMargins::CollapseThrough(margin)) => {
                 self.block_start_margin.union(margin);
                 Au(0)
             }
-            (MarginCollapseState::AccumulatingMarginIn, CollapsibleMargins::None(_, block_end)) => {
+            (MarginCollapseState::AccumulatingMarginIn,
+             CollapsibleMargins::None(_, block_end)) => {
                 assert_eq!(self.margin_in.most_positive, Au(0));
                 assert_eq!(self.margin_in.most_negative, Au(0));
                 block_end
             }
-            (MarginCollapseState::AccumulatingMarginIn, CollapsibleMargins::Collapse(_, block_end)) |
-            (MarginCollapseState::AccumulatingMarginIn, CollapsibleMargins::CollapseThrough(block_end)) => {
+            (MarginCollapseState::AccumulatingMarginIn,
+             CollapsibleMargins::Collapse(_, block_end)) |
+            (MarginCollapseState::AccumulatingMarginIn,
+             CollapsibleMargins::CollapseThrough(block_end)) => {
                 self.margin_in.union(block_end);
                 Au(0)
             }