diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index 87c23d00bb9..21aaa4d8236 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -89,7 +89,7 @@ struct InputActivationState {
     indeterminate: bool,
     checked: bool,
     checked_changed: bool,
-    checked_radio: MutNullableHeap<JS<HTMLInputElement>>,
+    checked_radio: Option<JS<HTMLInputElement>>,
     // In case mutability changed
     was_mutable: bool,
     // In case the type changed
@@ -102,7 +102,7 @@ impl InputActivationState {
             indeterminate: false,
             checked: false,
             checked_changed: false,
-            checked_radio: Default::default(),
+            checked_radio: None,
             was_mutable: false,
             old_type: InputType::InputText
         }
@@ -715,7 +715,7 @@ impl<'a> Activatable for &'a HTMLInputElement {
                                     r.r().Checked()
                                 })
                     };
-                    cache.checked_radio.set(checked_member.r().map(JS::from_ref));
+                    cache.checked_radio = checked_member.r().map(JS::from_ref);
                     cache.checked_changed = self.checked_changed.get();
                     self.SetChecked(true);
                 }
@@ -751,7 +751,7 @@ impl<'a> Activatable for &'a HTMLInputElement {
             InputType::InputRadio => {
                 // We want to restore state only if the element had been changed in the first place
                 if cache.was_mutable {
-                    let old_checked: Option<Root<HTMLInputElement>> = cache.checked_radio.get().map(|t| t.root());
+                    let old_checked: Option<Root<HTMLInputElement>> = cache.checked_radio.map(|t| t.root());
                     let name = self.get_radio_group_name();
                     match old_checked {
                         Some(ref o) => {
diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs
index 9830e38f837..7dffb7128e3 100644
--- a/components/script/dom/range.rs
+++ b/components/script/dom/range.rs
@@ -10,7 +10,7 @@ use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use dom::bindings::codegen::InheritTypes::NodeCast;
 use dom::bindings::error::{Error, ErrorResult, Fallible};
 use dom::bindings::global::GlobalRef;
-use dom::bindings::js::{JS, MutHeap, Root};
+use dom::bindings::js::{JS, Root};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::document::{Document, DocumentHelpers};
 use dom::node::{Node, NodeHelpers};
@@ -428,7 +428,7 @@ impl RangeInner {
 #[must_root]
 #[privatize]
 pub struct BoundaryPoint {
-    node: MutHeap<JS<Node>>,
+    node: JS<Node>,
     offset: u32,
 }
 
@@ -437,13 +437,13 @@ impl BoundaryPoint {
         debug_assert!(!node.is_doctype());
         debug_assert!(offset <= node.len());
         BoundaryPoint {
-            node: MutHeap::new(JS::from_ref(node)),
+            node: JS::from_ref(node),
             offset: offset,
         }
     }
 
     pub fn node(&self) -> Root<Node> {
-        self.node.get().root()
+        self.node.root()
     }
 
     pub fn offset(&self) -> u32 {
@@ -453,7 +453,7 @@ impl BoundaryPoint {
     fn set(&mut self, node: &Node, offset: u32) {
         debug_assert!(!node.is_doctype());
         debug_assert!(offset <= node.len());
-        self.node.set(JS::from_ref(node));
+        self.node = JS::from_ref(node);
         self.offset = offset;
     }
 }