diff --git a/common/content/commands.js b/common/content/commands.js
index 5ba7cd53..6c760c3c 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -409,7 +409,9 @@ const Commands = Module("commands", {
 
         let str = args.literalArg;
         if (str)
-            res.push(/\n/.test(str) ? "<<EOF\n" + str.replace(/\n$/, "") + "\nEOF" : str);
+            res.push(!/\n/.test(str) ? str :
+                     this.hereDoc    ? "<<EOF\n" + str.replace(/\n$/, "") + "\nEOF"
+                                     : str.replace(/\n/, "\n" + res[0].replace(/./g, " ").replace(/.$/, "\\")));
         return res.join(" ");
     },
 
diff --git a/common/content/io.js b/common/content/io.js
index 43d20ec6..c9f7bfed 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -528,7 +528,7 @@ lookup:
                               "E189: " + filename.quote() + " exists (add ! to override)");
 
                 // TODO: Use a set/specifiable list here:
-                let lines = [cmd.serialize().map(commands.commandToString) for (cmd in commands) if (cmd.serialize)];
+                let lines = [cmd.serialize().map(commands.commandToString, cmd) for (cmd in commands) if (cmd.serialize)];
                 lines = array.flatten(lines);
 
                 lines.unshift('"' + dactyl.version + "\n");