diff --git a/components/style/gecko_bindings/sugar/ownership.rs b/components/style/gecko_bindings/sugar/ownership.rs
index edd8394f31c..abcf5c65a8a 100644
--- a/components/style/gecko_bindings/sugar/ownership.rs
+++ b/components/style/gecko_bindings/sugar/ownership.rs
@@ -2,50 +2,52 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+//! Helpers for different FFI pointer kinds that Gecko's FFI layer uses.
+
 use std::marker::PhantomData;
 use std::mem::{forget, transmute};
 use std::ops::{Deref, DerefMut};
 use std::ptr;
 use std::sync::Arc;
 
-/// Indicates that a given Servo type has a corresponding
-/// Gecko FFI type
-/// The correspondence is not defined at this stage,
-/// use HasArcFFI or similar traits to define it
+/// Indicates that a given Servo type has a corresponding Gecko FFI type.
 pub unsafe trait HasFFI : Sized {
+    /// The corresponding Gecko type that this rust type represents.
+    ///
+    /// See the examples in `components/style/gecko/conversions.rs`.
     type FFIType: Sized;
 }
 
-/// Indicates that a given Servo type has the same layout
-/// as the corresponding HasFFI::FFIType type
+/// Indicates that a given Servo type has the same layout as the corresponding
+/// `HasFFI::FFIType` type.
 pub unsafe trait HasSimpleFFI : HasFFI {
     #[inline]
-    /// Given a Servo-side reference, converts it to an
-    /// FFI-safe reference which can be passed to Gecko
+    /// Given a Servo-side reference, converts it to an FFI-safe reference which
+    /// can be passed to Gecko.
     ///
     /// &ServoType -> &GeckoType
     fn as_ffi(&self) -> &Self::FFIType {
         unsafe { transmute(self) }
     }
     #[inline]
-    /// Given a Servo-side mutable reference, converts it to an
-    /// FFI-safe mutable reference which can be passed to Gecko
+    /// Given a Servo-side mutable reference, converts it to an FFI-safe mutable
+    /// reference which can be passed to Gecko.
     ///
     /// &mut ServoType -> &mut GeckoType
     fn as_ffi_mut(&mut self) -> &mut Self::FFIType {
         unsafe { transmute(self) }
     }
     #[inline]
-    /// Given an FFI-safe reference obtained from Gecko
-    /// converts it to a Servo-side reference
+    /// Given an FFI-safe reference obtained from Gecko converts it to a
+    /// Servo-side reference.
     ///
     /// &GeckoType -> &ServoType
     fn from_ffi(ffi: &Self::FFIType) -> &Self {
         unsafe { transmute(ffi) }
     }
     #[inline]
-    /// Given an FFI-safe mutable reference obtained from Gecko
-    /// converts it to a Servo-side mutable reference
+    /// Given an FFI-safe mutable reference obtained from Gecko converts it to a
+    /// Servo-side mutable reference.
     ///
     /// &mut GeckoType -> &mut ServoType
     fn from_ffi_mut(ffi: &mut Self::FFIType) -> &mut Self {
@@ -57,6 +59,9 @@ pub unsafe trait HasSimpleFFI : HasFFI {
 /// as a Box
 pub unsafe trait HasBoxFFI : HasSimpleFFI {
     #[inline]
+    /// Converts a borrowed Arc to a borrowed FFI reference.
+    ///
+    /// &Arc<ServoType> -> &GeckoType
     fn into_ffi(self: Box<Self>) -> Owned<Self::FFIType> {
         unsafe { transmute(self) }
     }
@@ -64,14 +69,15 @@ pub unsafe trait HasBoxFFI : HasSimpleFFI {
 
 /// Helper trait for conversions between FFI Strong/Borrowed types and Arcs
 ///
-/// Should be implemented by types which are passed over FFI as Arcs
-/// via Strong and Borrowed
+/// Should be implemented by types which are passed over FFI as Arcs via Strong
+/// and Borrowed.
 ///
-/// In this case, the FFIType is the rough equivalent of ArcInner<Self>
+/// In this case, the FFIType is the rough equivalent of ArcInner<Self>.
 pub unsafe trait HasArcFFI : HasFFI {
     // these methods can't be on Borrowed because it leads to an unspecified
     // impl parameter
-    /// Artificially increments the refcount of a (possibly null) borrowed Arc over FFI.
+    /// Artificially increments the refcount of a (possibly null) borrowed Arc
+    /// over FFI.
     unsafe fn addref_opt(ptr: Option<&Self::FFIType>) {
         forget(Self::arc_from_borrowed(&ptr).clone())
     }
@@ -109,6 +115,10 @@ pub unsafe trait HasArcFFI : HasFFI {
         }
     }
 
+    #[inline]
+    /// Converts a borrowed Arc to a borrowed FFI reference.
+    ///
+    /// &Arc<ServoType> -> &GeckoType
     fn arc_as_borrowed<'a>(arc: &'a Arc<Self>) -> &'a &Self::FFIType {
         unsafe {
             transmute::<&Arc<Self>, &&Self::FFIType>(arc)
@@ -116,6 +126,9 @@ pub unsafe trait HasArcFFI : HasFFI {
     }
 
     #[inline]
+    /// Converts a borrowed nullable FFI reference to a borrowed Arc.
+    ///
+    /// &GeckoType -> &Arc<ServoType>
     fn arc_from_borrowed<'a>(ptr: &'a Option<&Self::FFIType>) -> Option<&'a Arc<Self>> {
         unsafe {
             if let Some(ref reference) = *ptr {
@@ -129,27 +142,32 @@ pub unsafe trait HasArcFFI : HasFFI {
 
 #[repr(C)]
 /// Gecko-FFI-safe Arc (T is an ArcInner).
+///
 /// This can be null.
+///
 /// Leaks on drop. Please don't drop this.
-/// TODO: Add destructor bomb once drop flags are gone
-pub struct Strong<T> {
-    ptr: *const T,
-    _marker: PhantomData<T>,
+pub struct Strong<GeckoType> {
+    ptr: *const GeckoType,
+    _marker: PhantomData<GeckoType>,
 }
 
-impl<T> Strong<T> {
+impl<GeckoType> Strong<GeckoType> {
     #[inline]
+    /// Returns whether this reference is null.
     pub fn is_null(&self) -> bool {
-        self.ptr == ptr::null()
+        self.ptr.is_null()
     }
 
     #[inline]
-    /// Given a non-null strong FFI reference,
-    /// converts it into a servo-side Arc
+    /// Given a non-null strong FFI reference, converts it into a servo-side
+    /// Arc.
+    ///
     /// Panics on null.
     ///
     /// Strong<GeckoType> -> Arc<ServoType>
-    pub fn into_arc<U>(self) -> Arc<U> where U: HasArcFFI<FFIType = T> {
+    pub fn into_arc<ServoType>(self) -> Arc<ServoType>
+        where ServoType: HasArcFFI<FFIType = GeckoType>,
+    {
         self.into_arc_opt().unwrap()
     }
 
@@ -159,7 +177,9 @@ impl<T> Strong<T> {
     /// Returns None on null.
     ///
     /// Strong<GeckoType> -> Arc<ServoType>
-    pub fn into_arc_opt<U>(self) -> Option<Arc<U>> where U: HasArcFFI<FFIType = T> {
+    pub fn into_arc_opt<ServoType>(self) -> Option<Arc<ServoType>>
+        where ServoType: HasArcFFI<FFIType = GeckoType>,
+    {
         if self.is_null() {
             None
         } else {
@@ -168,12 +188,15 @@ impl<T> Strong<T> {
     }
 
     #[inline]
-    /// Given a reference to a strong FFI reference,
-    /// converts it to a reference to a servo-side Arc
+    /// Given a reference to a strong FFI reference, converts it to a reference
+    /// to a servo-side Arc.
+    ///
     /// Returns None on null.
     ///
     /// Strong<GeckoType> -> Arc<ServoType>
-    pub fn as_arc_opt<U>(&self) -> Option<&Arc<U>> where U: HasArcFFI<FFIType = T> {
+    pub fn as_arc_opt<ServoType>(&self) -> Option<&Arc<ServoType>>
+        where ServoType: HasArcFFI<FFIType = GeckoType>,
+    {
         if self.is_null() {
             None
         } else {
@@ -182,30 +205,42 @@ impl<T> Strong<T> {
     }
 
     #[inline]
-    /// Produces a null strong FFI reference
+    /// Produces a null strong FFI reference.
     pub fn null() -> Self {
-        unsafe { transmute(ptr::null::<T>()) }
+        unsafe { transmute(ptr::null::<GeckoType>()) }
     }
 }
 
+/// A few helpers implemented on top of Arc<ServoType> to make it more
+/// comfortable to use and write safe code with.
 pub unsafe trait FFIArcHelpers {
+    /// The Rust FFI type that we're implementing methods for.
     type Inner: HasArcFFI;
+
     /// Converts an Arc into a strong FFI reference.
     ///
     /// Arc<ServoType> -> Strong<GeckoType>
     fn into_strong(self) -> Strong<<Self::Inner as HasFFI>::FFIType>;
+
     /// Produces a (nullable) borrowed FFI reference by borrowing an Arc.
     ///
     /// &Arc<ServoType> -> Option<&GeckoType>
+    ///
+    /// FIXME(emilio): What's the point of the nullability? Arc should be
+    /// non-null, right?
+    ///
+    /// Then the `arc_as_borrowed` method can go away.
     fn as_borrowed_opt(&self) -> Option<&<Self::Inner as HasFFI>::FFIType>;
 }
 
 unsafe impl<T: HasArcFFI> FFIArcHelpers for Arc<T> {
     type Inner = T;
+
     #[inline]
     fn into_strong(self) -> Strong<T::FFIType> {
         unsafe { transmute(self) }
     }
+
     #[inline]
     fn as_borrowed_opt(&self) -> Option<&T::FFIType> {
         let borrowedptr = self as *const Arc<T> as *const Option<&T::FFIType>;
@@ -215,51 +250,62 @@ unsafe impl<T: HasArcFFI> FFIArcHelpers for Arc<T> {
 
 #[repr(C)]
 #[derive(Debug)]
-/// Gecko-FFI-safe owned pointer
-/// Cannot be null
-/// Leaks on drop. Please don't drop this.
-pub struct Owned<T> {
-    ptr: *mut T,
-    _marker: PhantomData<T>,
+/// Gecko-FFI-safe owned pointer.
+///
+/// Cannot be null, and leaks on drop, so needs to be converted into a rust-side
+/// `Box` before.
+pub struct Owned<GeckoType> {
+    ptr: *mut GeckoType,
+    _marker: PhantomData<GeckoType>,
 }
 
-impl<T> Owned<T> {
-    /// Owned<GeckoType> -> Box<ServoType>
-    pub fn into_box<U>(self) -> Box<U> where U: HasBoxFFI<FFIType = T> {
+impl<GeckoType> Owned<GeckoType> {
+    /// Gets this `Owned` type as a `Box<ServoType>`.
+    pub fn into_box<ServoType>(self) -> Box<ServoType>
+        where ServoType: HasBoxFFI<FFIType = GeckoType>,
+    {
         unsafe { transmute(self) }
     }
-    pub fn maybe(self) -> OwnedOrNull<T> {
+
+    /// Converts this instance to a (non-null) instance of `OwnedOrNull`.
+    pub fn maybe(self) -> OwnedOrNull<GeckoType> {
         unsafe { transmute(self) }
     }
 }
 
-impl<T> Deref for Owned<T> {
-    type Target = T;
-    fn deref(&self) -> &T {
+impl<GeckoType> Deref for Owned<GeckoType> {
+    type Target = GeckoType;
+    fn deref(&self) -> &GeckoType {
         unsafe { &*self.ptr }
     }
 }
 
-impl<T> DerefMut for Owned<T> {
-    fn deref_mut(&mut self) -> &mut T {
+impl<GeckoType> DerefMut for Owned<GeckoType> {
+    fn deref_mut(&mut self) -> &mut GeckoType {
         unsafe { &mut *self.ptr }
     }
 }
 
 #[repr(C)]
-/// Gecko-FFI-safe owned pointer
-/// Can be null
-pub struct OwnedOrNull<T> {
-    ptr: *mut T,
-    _marker: PhantomData<T>,
+/// Gecko-FFI-safe owned pointer.
+///
+/// Can be null, and just as `Owned` leaks on `Drop`.
+pub struct OwnedOrNull<GeckoType> {
+    ptr: *mut GeckoType,
+    _marker: PhantomData<GeckoType>,
 }
 
-impl<T> OwnedOrNull<T> {
+impl<GeckoType> OwnedOrNull<GeckoType> {
+    /// Returns whether this pointer is null.
+    #[inline]
     pub fn is_null(&self) -> bool {
-        self.ptr == ptr::null_mut()
+        self.ptr.is_null()
     }
-    /// OwnedOrNull<GeckoType> -> Option<Box<ServoType>>
-    pub fn into_box_opt<U>(self) -> Option<Box<U>> where U: HasBoxFFI<FFIType = T> {
+
+    /// Returns an owned pointer if this is non-null, and `None` otherwise.
+    pub fn into_box_opt<ServoType>(self) -> Option<Box<ServoType>>
+        where ServoType: HasBoxFFI<FFIType = GeckoType>,
+    {
         if self.is_null() {
             None
         } else {
@@ -267,8 +313,8 @@ impl<T> OwnedOrNull<T> {
         }
     }
 
-    /// OwnedOrNull<GeckoType> -> Option<Owned<GeckoType>>
-    pub fn into_owned_opt(self) -> Option<Owned<T>> {
+    /// Returns an `Owned<GeckoType>` if non-null, `None` otherwise.
+    pub fn into_owned_opt(self) -> Option<Owned<GeckoType>> {
         if self.is_null() {
             None
         } else {
@@ -276,11 +322,15 @@ impl<T> OwnedOrNull<T> {
         }
     }
 
-    pub fn borrow(&self) -> Option<&T> {
+    /// Gets a immutable reference to the underlying Gecko type, or `None` if
+    /// null.
+    pub fn borrow(&self) -> Option<&GeckoType> {
         unsafe { transmute(self) }
     }
 
-    pub fn borrow_mut(&self) -> Option<&mut T> {
+    /// Gets a mutable reference to the underlying Gecko type, or `None` if
+    /// null.
+    pub fn borrow_mut(&self) -> Option<&mut GeckoType> {
         unsafe { transmute(self) }
     }
 }