diff --git a/content/buffer.js b/content/buffer.js
index b0bb0b5d..27432c87 100644
--- a/content/buffer.js
+++ b/content/buffer.js
@@ -35,7 +35,7 @@ function Buffer() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
     /* FIXME: This doesn't belong here. */
     let mainWindowID = config.mainWindowID || "main-window";
-    let fontSize = util.computedStyle(document.getElementById(mainWindowID))["font-size"];
+    let fontSize = util.computedStyle(document.getElementById(mainWindowID)).fontSize;
 
     styles.registerSheet("chrome://liberator/skin/liberator.css");
     let error = styles.addSheet("font-size", "chrome://liberator/content/buffer.xhtml",
@@ -909,8 +909,8 @@ function Buffer() //{{{
                 selController.setCaretEnabled(caretmode);
             }
             let range = selection.getRangeAt(0);
-            if (util.computedStyle(range.startContainer)["white-space"] == "pre"
-                && util.computedStyle(range.endContainer)["white-space"] == "pre")
+            if (util.computedStyle(range.startContainer).whiteSpace == "pre"
+                && util.computedStyle(range.endContainer).whiteSpace == "pre")
                 return String(range);
             return String(selection);
         },
diff --git a/content/util.js b/content/util.js
index 2effa40d..60a60e4c 100644
--- a/content/util.js
+++ b/content/util.js
@@ -141,8 +141,7 @@ const util = { //{{{
     {
         while (node instanceof Text && node.parentNode)
             node = node.parentNode;
-        let style = node.ownerDocument.defaultView.getComputedStyle(node, null);
-        return util.Array.assocToObj(Array.map(style, function (k) [k, style.getPropertyValue(k)]));
+        return node.ownerDocument.defaultView.getComputedStyle(node, null);
     },
 
     copyToClipboard: function (str, verbose)