diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 94f8139cf02..0d57b38c16b 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -526,8 +526,9 @@ impl EventTarget {
         let args = if is_error { ERROR_ARG_NAMES } else { ARG_NAMES };
 
         let cx = window.get_cx();
-        let options =
-            unsafe { CompileOptionsWrapper::new(*cx, handler.url.as_str(), handler.line as u32) };
+        let options = unsafe {
+            CompileOptionsWrapper::new(*cx, &handler.url.to_string(), handler.line as u32)
+        };
 
         // Step 3.9, subsection Scope steps 1-6
         let scopechain = RootedObjectVectorWrapper::new(*cx);
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 76dcc79424f..38465a4af06 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -1432,9 +1432,6 @@ impl WindowMethods for Window {
             .filter(|elem| is_named_element_with_id_attribute(elem));
 
         // Step 2.
-        // TODO(pylbrecht): it would be great to just iterate over
-        // elements_with_id, but it seems document.get_elements_with_id()
-        // does not return HTMLIFrameElements. Why is that?
         for elem in iframe_iter.clone() {
             if let Some(nested_window_proxy) = elem
                 .downcast::<HTMLIFrameElement>()
diff --git a/components/script/window_named_properties.rs b/components/script/window_named_properties.rs
index fd579f35d86..c4c6217e513 100644
--- a/components/script/window_named_properties.rs
+++ b/components/script/window_named_properties.rs
@@ -242,7 +242,6 @@ pub fn create(
             HANDLER.0,
             UndefinedHandleValue,
             proto.get(),
-            // TODO: pass proper clasp
             &CLASS,
             false,
         ));