diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index ce4dd123d00..80441a60c9b 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -1212,7 +1212,11 @@ impl ScriptTask {
     fn handle_reflow_event(&self, pipeline_id: PipelineId) {
         debug!("script got reflow event");
         let page = get_page(&self.root_page(), pipeline_id);
-        self.force_reflow(&*page, ReflowReason::ReceivedReflowEvent);
+        let document = page.document().root();
+        let window = window_from_node(document.r()).root();
+        window.r().reflow(ReflowGoal::ForDisplay,
+                          ReflowQueryType::NoQuery,
+                          ReflowReason::ReceivedReflowEvent);
     }
 
     /// Initiate a non-blocking fetch for a specified resource. Stores the InProgressLoad
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index bd9367ab0d6..5dfbbe8696c 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -34,11 +34,13 @@ default = ["glutin_app", "window"]
 window = ["glutin_app/window"]
 headless = ["glutin_app/headless"]
 
-[profile.release]
-opt-level = 3
-debug = true
-rpath = false
-lto = false
+# Uncomment to profile on Linux:
+#
+# [profile.release]
+# opt-level = 3
+# debug = true
+# rpath = false
+# lto = false
 
 [dependencies.compositing]
 path = "../compositing"
diff --git a/components/util/task_state.rs b/components/util/task_state.rs
index 290f2a08166..82dffa8ee4a 100644
--- a/components/util/task_state.rs
+++ b/components/util/task_state.rs
@@ -26,9 +26,14 @@ bitflags! {
 macro_rules! task_types ( ( $( $fun:ident = $flag:ident ; )* ) => (
     impl TaskState {
         $(
+            #[cfg(not(ndebug))]
             pub fn $fun(self) -> bool {
                 self.contains($flag)
             }
+            #[cfg(ndebug)]
+            pub fn $fun(self) -> bool {
+                true
+            }
         )*
     }