diff --git a/content/io.js b/content/io.js
index 375091d0..41cd316f 100644
--- a/content/io.js
+++ b/content/io.js
@@ -762,10 +762,11 @@ lookup:
         // no need (actually forbidden) to add: js <<EOF ... EOF around those files
         source: function (filename, silent)
         {
+            var wasSourcing = ioManager.sourcing;
             try
             {
                 var file = ioManager.getFile(filename);
-                this.sourcing = {
+                ioManager.sourcing = {
                     file: file.path,
                     line: 0
                 };
@@ -832,7 +833,7 @@ lookup:
                         }
                         else
                         {
-                            this.sourcing.line = i + 1;
+                            ioManager.sourcing.line = i + 1;
                             // skip line comments and blank lines
                             if (/^\s*(".*)?$/.test(line))
                                 continue;
@@ -908,7 +909,7 @@ lookup:
             }
             finally
             {
-                this.sourcing = null;
+                ioManager.sourcing = wasSourcing;
             }
         }
     }; //}}}
diff --git a/content/mappings.js b/content/mappings.js
index 73a6b8a2..3eed6226 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -218,7 +218,8 @@ function Mappings() //{{{
 
         commands.add([ch + "no[remap]"],
             "Map a key sequence without remapping keys" + modeDescription,
-            function (args) { map(args, modes, true); });
+            function (args) { map(args, modes, true); },
+            opts);
 
         commands.add([ch + "mapc[lear]"],
             "Remove all mappings" + modeDescription,