diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index c9f3aa011a1d4..46002c089cf9f 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -868,10 +868,10 @@ themePicker.onblur = handleThemeButtonsBlur;
     }
 
     {
-        let mut data = static_files::STORAGE_JS.to_owned();
-        data.push_str(&format!("var resourcesSuffix = \"{}\";", cx.shared.resource_suffix));
         write_minify(cx.dst.join(&format!("storage{}.js", cx.shared.resource_suffix)),
-                     &data,
+                     &format!("var resourcesSuffix = \"{}\";{}",
+                              cx.shared.resource_suffix,
+                              static_files::STORAGE_JS),
                      options.enable_minification)?;
     }
 
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 51714c35d6faa..d5b8ecd4807f1 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -213,9 +213,9 @@ if (!DOMTokenList.prototype.remove) {
     function expandSection(id) {
         var elem = document.getElementById(id);
         if (elem && isHidden(elem)) {
-            var h3 = elem.parentNode.previousSibling;
+            var h3 = elem.parentNode.previousElementSibling;
             if (h3 && h3.tagName !== "H3") {
-                h3 = h3.previousSibling; // skip div.docblock
+                h3 = h3.previousElementSibling; // skip div.docblock
             }
 
             if (h3) {
diff --git a/src/librustdoc/html/static/storage.js b/src/librustdoc/html/static/storage.js
index d1c377bf95ac8..22ac52f87285c 100644
--- a/src/librustdoc/html/static/storage.js
+++ b/src/librustdoc/html/static/storage.js
@@ -111,7 +111,7 @@ function switchTheme(styleElem, mainStyleElem, newTheme) {
 
     var found = false;
     if (savedHref.length === 0) {
-        onEach(document.getElementsByTagName("link"), function(el) {
+        onEachLazy(document.getElementsByTagName("link"), function(el) {
             savedHref.push(el.href);
         });
     }