diff --git a/common/content/commands.js b/common/content/commands.js
index 2baa56f0..396d7b82 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -986,7 +986,7 @@ const Commands = Module("commands", {
                                     var completer = liberator.eval(completeOpt);
 
                                     if (!(completer instanceof Function))
-                                        throw new TypeError("User-defined custom completer '" + completeOpt + "' is not a function");
+                                        throw new TypeError("User-defined custom completer " + completeOpt.quote() + " is not a function");
                                 }
                                 catch (e) {
                                     liberator.echo(":" + this.name + " ...");
diff --git a/common/content/events.js b/common/content/events.js
index 955cf38f..cfab6641 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -80,7 +80,7 @@ const Events = Module("events", {
 
                 if (dirs.length > 0) {
                     for (let [, dir] in Iterator(dirs)) {
-                        liberator.echomsg('Searching for "macros/*" in "' + dir.path + '"', 2);
+                        liberator.echomsg('Searching for "macros/*" in ' + dir.path.quote(), 2);
                         liberator.log("Sourcing macros directory: " + dir.path + "...", 3);
 
                         for (let file in dir.iterDirectory()) {
diff --git a/common/content/hints.js b/common/content/hints.js
index 6ba8f37d..d9323da1 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -117,13 +117,13 @@ const Hints = Module("hints", {
      * @returns [text, showText]
      */
     _getInputHint: function (elem, doc) {
-        // <input type="submit|button|this._reset">   Always use the value
-        // <input type="radio|checkbox">        Use the value if it is not numeric or label or name
-        // <input type="password">              Never use the value, use label or name
-        // <input type="text|file"> <textarea>  Use value if set or label or name
-        // <input type="image">                 Use the alt text if present (showText) or label or name
-        // <input type="hidden">                Never gets here
-        // <select>                             Use the text of the selected item or label or name
+        // <input type="submit|button|reset"/>   Always use the value
+        // <input type="radio|checkbox"/>        Use the value if it is not numeric or label or name
+        // <input type="password"/>              Never use the value, use label or name
+        // <input type="text|file"/> <textarea/> Use value if set or label or name
+        // <input type="image"/>                 Use the alt text if present (showText) or label or name
+        // <input type="hidden"/>                Never gets here
+        // <select/>                             Use the text of the selected item or label or name
 
         let type = elem.type;
 
@@ -149,7 +149,7 @@ const Hints = Module("hints", {
                 else if (option == "label") {
                     if (elem.id) {
                         // TODO: (possibly) do some guess work for label-like objects
-                        let label = util.evaluateXPath("//label[@for='" + elem.id + "']", doc).snapshotItem(0);
+                        let label = util.evaluateXPath(["label[@for=" + elem.id.quote() + "]"], doc).snapshotItem(0);
                         if (label)
                             return [label.textContent.toLowerCase(), true];
                     }
@@ -400,7 +400,7 @@ const Hints = Module("hints", {
             for (let [, { doc: doc }] in Iterator(this._docs)) {
                 for (let elem in util.evaluateXPath(" {//*[@liberator:highlight and @number]", doc)) {
                     let group = elem.getAttributeNS(NS.uri, "highlight");
-                    css.push(highlight.selector(group) + "[number='" + elem.getAttribute("number") + "'] { " + elem.style.cssText + " }");
+                    css.push(highlight.selector(group) + "[number=" + elem.getAttribute("number").quote() + "] { " + elem.style.cssText + " }");
                 }
             }
             styles.addSheet(true, "hint-positions", "*", css.join("\n"));
diff --git a/common/content/liberator.js b/common/content/liberator.js
index 5a600ae1..a4b00ded 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1284,7 +1284,7 @@ const Liberator = Module("liberator", {
                     liberator.echoerr("E475: Invalid argument: " + arg);
                 }
                 catch (e) {
-                    liberator.echoerr("Error opening '" + arg + "': " + e);
+                    liberator.echoerr("Error opening " + arg.quote() + ": " + e);
                 }
             }, {
                 argCount: "1",
diff --git a/common/content/options.js b/common/content/options.js
index f0d985ff..7188f0ac 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -533,7 +533,7 @@ const Options = Module("options", {
 
         if (option.name in this._optionHash) {
             // never replace for now
-            liberator.log("Warning: '" + names[0] + "' already exists, NOT replacing existing option.", 1);
+            liberator.log("Warning: " + names[0].quote() + " already exists, NOT replacing existing option.", 1);
             return false;
         }
 
diff --git a/common/content/style.js b/common/content/style.js
index 39c1f136..9183df53 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -357,9 +357,9 @@ function Styles(name, store) {
     const storage = modules.storage;
     const ios = services.get("io");
     const sss = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Ci.nsIStyleSheetService);
-    const namespace = '@namespace html "' + XHTML + '";\n' +
-                      '@namespace xul "' + XUL + '";\n' +
-                      '@namespace liberator "' + NS.uri + '";\n';
+    const namespace = "@namespace html " + XHTML.uri.quote() + ";\n" +
+                      "@namespace xul " + XUL.uri.quote() + ";\n" +
+                      "@namespace liberator " + NS.uri.quote() + ";\n";
 
     const Sheet = Struct("name", "id", "sites", "css", "system", "agent");
     Sheet.prototype.__defineGetter__("fullCSS", function wrapCSS() {
diff --git a/common/content/util.js b/common/content/util.js
index 57640d7d..c6a7cd45 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -294,7 +294,7 @@ const Util = Module("util", {
 
                         data.push("<"); data.push(node.localName);
                         if (node instanceof HTMLHtmlElement)
-                            data.push(' xmlns="' + XHTML.uri + '"');
+                            data.push(" xmlns=" + XHTML.uri.quote());
 
                         for (let { name: name, value: value } in util.Array.itervalues(node.attributes)) {
                             if (name == "liberator:highlight") {