diff --git a/muttator/components/about-handler.js b/muttator/components/about-handler.js
index b7263a89..489de20c 100644
--- a/muttator/components/about-handler.js
+++ b/muttator/components/about-handler.js
@@ -1,7 +1,10 @@
 // Header:
 const Name = "Muttator";
-// The following doesn't work here, so this module's code is sadly duplicated:
-//     Components.utils.import("resource://liberator/about-handler.jsm");
+/*
+ * We can't load our modules here, so the following code is sadly
+ * duplicated: .w !sh
+vimdiff ../../*'/components/about-handler.js'
+ */
 
 // Copyright (c) 2009 by Doug Kearns
 //
diff --git a/muttator/components/commandline-handler.js b/muttator/components/commandline-handler.js
index fe2d0fd9..ec96d315 100644
--- a/muttator/components/commandline-handler.js
+++ b/muttator/components/commandline-handler.js
@@ -1,7 +1,10 @@
 // Header:
 const Name = "Muttator";
-// The following doesn't work here, so this module's code is sadly duplicated:
-//     Components.utils.import("resource://liberator/commandline-handler.jsm");
+/*
+ * We can't load our modules here, so the following code is sadly
+ * duplicated: .w !sh
+vimdiff ../../*'/components/commandline-handler.js'
+ */
 
 // Copyright (c) 2009 by Doug Kearns
 //
diff --git a/vimperator/components/about-handler.js b/vimperator/components/about-handler.js
index 57d99649..f6a386c0 100644
--- a/vimperator/components/about-handler.js
+++ b/vimperator/components/about-handler.js
@@ -1,7 +1,10 @@
 // Header:
 const Name = "Vimperator";
-// The following doesn't work here, so this module's code is sadly duplicated:
-//     Components.utils.import("resource://liberator/about-handler.jsm");
+/*
+ * We can't load our modules here, so the following code is sadly
+ * duplicated: .w !sh
+vimdiff ../../*'/components/about-handler.js'
+ */
 
 // Copyright (c) 2009 by Doug Kearns
 //
@@ -28,9 +31,7 @@ AboutHandler.prototype = {
     newChannel: function (uri) {
         let channel = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService)
                           .newChannel("chrome://" + name + "/content/about.html", null, null);
-
         channel.originalURI = uri;
-
         return channel;
     },
 
diff --git a/vimperator/components/commandline-handler.js b/vimperator/components/commandline-handler.js
index 4fe1c51c..5ddb6713 100644
--- a/vimperator/components/commandline-handler.js
+++ b/vimperator/components/commandline-handler.js
@@ -1,7 +1,10 @@
 // Header:
 const Name = "Vimperator";
-// The following doesn't work here, so this module's code is sadly duplicated:
-//     Components.utils.import("resource://liberator/commandline-handler.jsm");
+/*
+ * We can't load our modules here, so the following code is sadly
+ * duplicated: .w !sh
+vimdiff ../../*'/components/commandline-handler.js'
+ */
 
 // Copyright (c) 2009 by Doug Kearns
 //
diff --git a/xulmus/components/about-handler.js b/xulmus/components/about-handler.js
index 9bcffedd..89f418d5 100644
--- a/xulmus/components/about-handler.js
+++ b/xulmus/components/about-handler.js
@@ -1,7 +1,10 @@
 // Header:
 const Name = "Xulmus";
-// The following doesn't work here, so this module's code is sadly duplicated:
-//     Components.utils.import("resource://liberator/about-handler.jsm");
+/*
+ * We can't load our modules here, so the following code is sadly
+ * duplicated: .w !sh
+vimdiff ../../*'/components/about-handler.js'
+ */
 
 // Copyright (c) 2009 by Doug Kearns
 //
diff --git a/xulmus/components/commandline-handler.js b/xulmus/components/commandline-handler.js
index b4e07299..29478706 100644
--- a/xulmus/components/commandline-handler.js
+++ b/xulmus/components/commandline-handler.js
@@ -1,7 +1,10 @@
 // Header:
 const Name = "Xulmus";
-// The following doesn't work here, so this module's code is sadly duplicated:
-//     Components.utils.import("resource://liberator/commandline-handler.jsm");
+/*
+ * We can't load our modules here, so the following code is sadly
+ * duplicated: .w !sh
+vimdiff ../../*'/components/commandline-handler.js'
+ */
 
 // Copyright (c) 2009 by Doug Kearns
 //