diff --git a/components/style/animation.rs b/components/style/animation.rs
index c2e3f33b794..e76c9b7251c 100644
--- a/components/style/animation.rs
+++ b/components/style/animation.rs
@@ -419,17 +419,15 @@ impl PropertyAnimation {
 /// Inserts transitions into the queue of running animations as applicable for
 /// the given style difference. This is called from the layout worker threads.
 /// Returns true if any animations were kicked off and false otherwise.
-//
-// TODO(emilio): Take rid of this mutex splitting SharedLayoutContex into a
-// cloneable part and a non-cloneable part..
 #[cfg(feature = "servo")]
-pub fn start_transitions_if_applicable(new_animations_sender: &Sender<Animation>,
-                                       opaque_node: OpaqueNode,
-                                       old_style: &ComputedValues,
-                                       new_style: &mut Arc<ComputedValues>,
-                                       timer: &Timer,
-                                       possibly_expired_animations: &[PropertyAnimation])
-                                       -> bool {
+pub fn start_transitions_if_applicable(
+    new_animations_sender: &Sender<Animation>,
+    opaque_node: OpaqueNode,
+    old_style: &ComputedValues,
+    new_style: &mut Arc<ComputedValues>,
+    timer: &Timer,
+    possibly_expired_animations: &[PropertyAnimation]
+) -> bool {
     let mut had_animations = false;
     for i in 0..new_style.get_box().transition_property_count() {
         // Create any property animations, if applicable.
diff --git a/components/style/bloom.rs b/components/style/bloom.rs
index a49f40e9bc3..5c7f753a6c8 100644
--- a/components/style/bloom.rs
+++ b/components/style/bloom.rs
@@ -88,14 +88,15 @@ impl<E: TElement> PushedElement<E> {
     fn new(el: E, num_hashes: usize) -> Self {
         PushedElement {
             element: unsafe { SendElement::new(el) },
-            num_hashes: num_hashes,
+            num_hashes,
         }
     }
 }
 
 fn each_relevant_element_hash<E, F>(element: E, mut f: F)
-    where E: TElement,
-          F: FnMut(u32),
+where
+    E: TElement,
+    F: FnMut(u32),
 {
     f(element.get_local_name().get_hash());
     f(element.get_namespace().get_hash());
@@ -104,10 +105,6 @@ fn each_relevant_element_hash<E, F>(element: E, mut f: F)
         f(id.get_hash());
     }
 
-    // TODO: case-sensitivity depends on the document type and quirks mode.
-    //
-    // TODO(emilio): It's not clear whether that's relevant here though?
-    // Classes and ids should be normalized already I think.
     element.each_class(|class| {
         f(class.get_hash())
     });
diff --git a/components/style/invalidation/stylesheets.rs b/components/style/invalidation/stylesheets.rs
index b351bdd12ee..5a2fa8c1e0a 100644
--- a/components/style/invalidation/stylesheets.rs
+++ b/components/style/invalidation/stylesheets.rs
@@ -53,8 +53,8 @@ impl InvalidationScope {
 
 /// A set of invalidations due to stylesheet additions.
 ///
-/// TODO(emilio): We might be able to do the same analysis for removals and
-/// media query changes too?
+/// TODO(emilio): We might be able to do the same analysis for media query
+/// changes too (or even selector changes?).
 #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
 pub struct StylesheetInvalidationSet {
     /// The style scopes we know we have to restyle so far.