diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 4332683d..82e99b61 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -435,7 +435,7 @@ this.Set = deprecated("RealSet", function Set(ary) {
  * @param {string} key The key to add.
  * @returns boolean
  */
-Set.add = deprecated("Set#add",
+Set.add = deprecated("RealSet#add",
     curry(function Set__add(set, key) {
         if (isinstance(set, ["Set"])) {
             let res = set.has(key);
@@ -469,13 +469,14 @@ Set.has = deprecated("hasOwnProperty or Set#has",
  * @param {object} set The set.
  * @returns {object}
  */
-Set.subtract = function set_subtract(set) {
-    set = update({}, set);
-    for (let i = 1; i < arguments.length; i++)
-        for (let k in keys(arguments[i]))
-            delete set[k];
-    return set;
-};
+Set.subtract = deprecated("RealSet#difference",
+    function set_subtract(set) {
+        set = update({}, set);
+        for (let i = 1; i < arguments.length; i++)
+            for (let k in keys(arguments[i]))
+                delete set[k];
+        return set;
+    });
 
 /**
  * Removes an element from a set and returns true if the element was
@@ -485,7 +486,7 @@ Set.subtract = function set_subtract(set) {
  * @param {string} key The key to remove.
  * @returns boolean
  */
-Set.remove = deprecated("Set#delete",
+Set.remove = deprecated("RealSet#delete",
     curry(function Set__remove(set, key) {
         if (isinstance(set, ["Set"]))
             return set.delete(key);
@@ -1180,7 +1181,7 @@ function Module(name, prototype, ...args) {
         let proto = callable(prototype) ? args[0] : prototype;
 
         proto._metaInit_ = function () {
-            delete module.prototype._metaInit_;
+            module.prototype._metaInit_ = null;
             currentModule[name.toLowerCase()] = this;
         };
 
diff --git a/common/modules/cache.jsm b/common/modules/cache.jsm
index cbf2a3f6..0f13ca1e 100644
--- a/common/modules/cache.jsm
+++ b/common/modules/cache.jsm
@@ -121,7 +121,7 @@ var Cache = Module("Cache", XPCOM(Ci.nsIRequestObserver), {
     closeReader: function closeReader() {
         if (cache._cacheReader) {
             this.cacheReader.close();
-            delete cache._cacheReader;
+            cache._cacheReader = null;
         }
     },
 
@@ -130,7 +130,7 @@ var Cache = Module("Cache", XPCOM(Ci.nsIRequestObserver), {
 
         if (this._cacheWriter) {
             this._cacheWriter.close();
-            delete cache._cacheWriter;
+            cache._cacheWriter = null;
 
             // ZipWriter bug.
             if (this.cacheFile.fileSize <= 22)
diff --git a/common/modules/highlight.jsm b/common/modules/highlight.jsm
index d585684a..ae02af9e 100644
--- a/common/modules/highlight.jsm
+++ b/common/modules/highlight.jsm
@@ -134,8 +134,12 @@ var Highlights = Module("Highlight", {
             obj.style.enabled = true;
         else
             this.loaded.__defineSetter__(obj.class, function () {
-                delete this[obj.class];
-                this[obj.class] = true;
+                Object.defineProperty(this, obj.class, {
+                    value: true,
+                    configurable: true,
+                    enumerable: true,
+                    writable: true
+                });
 
                 if (obj.class === obj.baseClass)
                     for (let h in highlight)