diff --git a/js/ArgParser.js b/js/ArgParser.js
index f3cfae735..b1d354359 100755
--- a/js/ArgParser.js
+++ b/js/ArgParser.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
  Parse a space-separated string of name:value parameters. Values can be quoted with single quotes, double quotes,
  double square brackets, or double curly braces.
@@ -94,3 +96,5 @@ ArgParser.prototype.getValuesByName = function(n,defaultValue) {
 };
 
 exports.ArgParser = ArgParser;
+
+})();
diff --git a/js/FileRetriever.js b/js/FileRetriever.js
index 2b11f3658..ce4d7570c 100644
--- a/js/FileRetriever.js
+++ b/js/FileRetriever.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 FileRetriever can asynchronously retrieve files from HTTP URLs or the local file system
 */
@@ -77,3 +79,5 @@ FileRetriever.retrieveFile = function(filepath,contextPath,callback) {
 		callback(err,result);
 	});
 };
+
+})();
diff --git a/js/Recipe.js b/js/Recipe.js
index bd0d14cee..9ce8020d9 100755
--- a/js/Recipe.js
+++ b/js/Recipe.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 
 Recipe processing is in four parts:
@@ -333,3 +335,4 @@ Recipe.prototype.cookRss = function()
 
 exports.Recipe = Recipe;
 
+})();
diff --git a/js/TextProcessors.js b/js/TextProcessors.js
index 6dace7fc2..a8b04abc4 100644
--- a/js/TextProcessors.js
+++ b/js/TextProcessors.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*jslint node: true */
 "use strict";
 
@@ -24,3 +26,5 @@ TextProcessors.prototype.parse = function(type,text) {
 };
 
 exports.TextProcessors = TextProcessors;
+
+})();
diff --git a/js/Tiddler.js b/js/Tiddler.js
index e831a132d..f36ef046a 100755
--- a/js/Tiddler.js
+++ b/js/Tiddler.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 
 Tiddlers are an immutable dictionary of name:value pairs called fields. Values can be a string, an array
@@ -105,3 +107,5 @@ Tiddler.specialTiddlerFieldParsers = {
 };
 
 exports.Tiddler = Tiddler;
+
+})();
diff --git a/js/TiddlerConverters.js b/js/TiddlerConverters.js
index 6d8d6af19..9cbb429f6 100644
--- a/js/TiddlerConverters.js
+++ b/js/TiddlerConverters.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*jslint node: true */
 "use strict";
 
@@ -44,3 +46,5 @@ TiddlerConverters.prototype.deserialize = function(type,text,srcFields) {
 };
 
 exports.TiddlerConverters = TiddlerConverters;
+
+})();
diff --git a/js/TiddlerInput.js b/js/TiddlerInput.js
index 768354802..eaae9924a 100755
--- a/js/TiddlerInput.js
+++ b/js/TiddlerInput.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 Functions concerned with parsing representations of tiddlers
 */
@@ -162,3 +164,5 @@ tiddlerInput.register = function(tiddlerConverters) {
 	tiddlerConverters.registerDeserializer(".json","application/json",inputTiddlerJSON);
 	tiddlerConverters.registerDeserializer(".tiddlywiki","application/x-tiddlywiki",inputTiddlyWiki);
 };
+
+})();
diff --git a/js/TiddlerOutput.js b/js/TiddlerOutput.js
index 6ca5a1b0d..aae93c74e 100755
--- a/js/TiddlerOutput.js
+++ b/js/TiddlerOutput.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 Functions concerned with parsing representations of tiddlers
 */
@@ -104,3 +106,5 @@ tiddlerOutput.register = function(tiddlerConverters) {
 	tiddlerConverters.registerSerializer(".tid","application/x-tiddler",outputTiddler);
 	tiddlerConverters.registerSerializer(".tiddler","application/x-tiddler-html-div",outputTiddlerDiv);
 };
+
+})();
diff --git a/js/Utils.js b/js/Utils.js
index 8743ab2a3..b68407043 100755
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 Various static utility functions.
 
@@ -17,7 +19,7 @@ utils.deepCopy = function(v) {
 		for(t=0; t<v.length; t++) {
 			r.push(utils.deepCopy(v[t]));
 		}
-	} else if (v === Object(v)) {
+	} else if (typeof v === "object" && v) {
 		r = {};
 		for(t in v) {
 			r[t] = utils.deepCopy(v[t]);
@@ -28,6 +30,7 @@ utils.deepCopy = function(v) {
 	return r;
 };
 
+
 // Pad a string to a certain length with zeros
 utils.zeroPad = function(n,d)
 {
@@ -182,3 +185,5 @@ utils.entityDecode = function(s) {
 };
 
 utils.htmlEntities = {quot:34, amp:38, apos:39, lt:60, gt:62, nbsp:160, iexcl:161, cent:162, pound:163, curren:164, yen:165, brvbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not:172, shy:173, reg:174, macr:175, deg:176, plusmn:177, sup2:178, sup3:179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde:213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml:255, OElig:338, oelig:339, Scaron:352, scaron:353, Yuml:376, fnof:402, circ:710, tilde:732, Alpha:913, Beta:914, Gamma:915, Delta:916, Epsilon:917, Zeta:918, Eta:919, Theta:920, Iota:921, Kappa:922, Lambda:923, Mu:924, Nu:925, Xi:926, Omicron:927, Pi:928, Rho:929, Sigma:931, Tau:932, Upsilon:933, Phi:934, Chi:935, Psi:936, Omega:937, alpha:945, beta:946, gamma:947, delta:948, epsilon:949, zeta:950, eta:951, theta:952, iota:953, kappa:954, lambda:955, mu:956, nu:957, xi:958, omicron:959, pi:960, rho:961, sigmaf:962, sigma:963, tau:964, upsilon:965, phi:966, chi:967, psi:968, omega:969, thetasym:977, upsih:978, piv:982, ensp:8194, emsp:8195, thinsp:8201, zwnj:8204, zwj:8205, lrm:8206, rlm:8207, ndash:8211, mdash:8212, lsquo:8216, rsquo:8217, sbquo:8218, ldquo:8220, rdquo:8221, bdquo:8222, dagger:8224, Dagger:8225, bull:8226, hellip:8230, permil:8240, prime:8242, Prime:8243, lsaquo:8249, rsaquo:8250, oline:8254, frasl:8260, euro:8364, image:8465, weierp:8472, real:8476, trade:8482, alefsym:8501, larr:8592, uarr:8593, rarr:8594, darr:8595, harr:8596, crarr:8629, lArr:8656, uArr:8657, rArr:8658, dArr:8659, hArr:8660, forall:8704, part:8706, exist:8707, empty:8709, nabla:8711, isin:8712, notin:8713, ni:8715, prod:8719, sum:8721, minus:8722, lowast:8727, radic:8730, prop:8733, infin:8734, ang:8736, and:8743, or:8744, cap:8745, cup:8746, int:8747, there4:8756, sim:8764, cong:8773, asymp:8776, ne:8800, equiv:8801, le:8804, ge:8805, sub:8834, sup:8835, nsub:8836, sube:8838, supe:8839, oplus:8853, otimes:8855, perp:8869, sdot:8901, lceil:8968, rceil:8969, lfloor:8970, rfloor:8971, lang:9001, rang:9002, loz:9674, spades:9824, clubs:9827, hearts:9829, diams:9830 };
+
+})();
diff --git a/js/WikiStore.js b/js/WikiStore.js
index 5ae4b534b..3ef529fd9 100755
--- a/js/WikiStore.js
+++ b/js/WikiStore.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*jslint node: true */
 "use strict";
 
@@ -89,7 +91,7 @@ WikiStore.prototype.parseTiddler = function(title) {
 	} else {
 		return null;
 	}
-}
+};
 
 WikiStore.prototype.renderTiddler = function(type,title) {
 	var parser = this.parseTiddler(title);
@@ -98,6 +100,8 @@ WikiStore.prototype.renderTiddler = function(type,title) {
 	} else {
 		return null;
 	}
-}
+};
 
 exports.WikiStore = WikiStore;
+
+})();
diff --git a/js/WikiTextParser.js b/js/WikiTextParser.js
index 793db9f3b..97158c0ba 100644
--- a/js/WikiTextParser.js
+++ b/js/WikiTextParser.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 
 WikiTextParser.js
@@ -152,3 +154,5 @@ WikiTextParser.prototype.render = function(type,treenode,store,title) {
 };
 
 exports.WikiTextParser = WikiTextParser;
+
+})();
diff --git a/js/WikiTextProcessor.js b/js/WikiTextProcessor.js
index 6a2e308cb..7f209415d 100644
--- a/js/WikiTextProcessor.js
+++ b/js/WikiTextProcessor.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*jslint node: true */
 "use strict";
 
@@ -24,6 +26,8 @@ var WikiTextProcessor = function(options) {
 
 WikiTextProcessor.prototype.parse = function(text) {
 	return new WikiTextParser(text,this);
-}
+};
 
 exports.WikiTextProcessor = WikiTextProcessor;
+
+})();
diff --git a/js/WikiTextRenderer.js b/js/WikiTextRenderer.js
index 12928c2ab..336c8fedd 100644
--- a/js/WikiTextRenderer.js
+++ b/js/WikiTextRenderer.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 Wiki text macro implementation
 */
@@ -209,3 +211,4 @@ WikiTextRenderer.macros = {
 
 exports.WikiTextRenderer = WikiTextRenderer;
 
+})();
diff --git a/js/WikiTextRules.js b/js/WikiTextRules.js
index 08b0d5f45..d07a267dc 100755
--- a/js/WikiTextRules.js
+++ b/js/WikiTextRules.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*jslint node: true */
 "use strict";
 
@@ -667,3 +669,5 @@ var rules = [
 ];
 
 exports.rules = rules;
+
+})();
diff --git a/readme.md b/readme.md
index df6262697..0cb5dbc99 100644
--- a/readme.md
+++ b/readme.md
@@ -270,9 +270,9 @@ This module privately includes the following modules:
 Creates a new instance of the wiki text processor with the specified options. The options are a hashmap of optional members and are planned as follows:
 
 * **enableRules:** An array of names of wiki text rules to enable. If not specified, all rules are available
-* **extraRules:** An array of additional rule handlers to add
+* **extraRules:** A hashmap of additional rule handlers to add
 * **enableMacros:** An array of names of macros to enable. If not specified, all macros are available
-* **extraMacros:** An array of additional macro handlers to add
+* **extraMacros:** A hashmap of additional macro handlers to add
 
 ### WikiStore.js
 
diff --git a/tiddlywiki.js b/tiddlywiki.js
index 4da1658f7..6b7a80710 100644
--- a/tiddlywiki.js
+++ b/tiddlywiki.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 TiddlyWiki command line interface
 */
@@ -95,27 +97,6 @@ for(var t=0; t<shadowShadows.length; t++) {
 	shadowShadowStore.addTiddler(new Tiddler(shadowShadows[t]));
 }
 
-var processNextSwitch = function() {
-	if(currSwitch < switches.length) {
-		var s = switches[currSwitch++],
-			csw = commandLineSwitches[s.switchName];
-		if(s.args.length < csw.args.min) {
-			throw "Command line switch --" + s.switchName + " should have a minimum of " + csw.args.min + " arguments";
-		}
-		if(s.args.length > csw.args.max) {
-			throw "Command line switch --" + s.switchName + " should have a maximum of " + csw.args.max + " arguments";
-		}
-		csw.handler(s.args,function (err) {
-			if(err) {
-				throw err;
-			}
-			process.nextTick(processNextSwitch);
-		});
-	}
-};
-
-process.nextTick(processNextSwitch);
-
 /*
 Each command line switch is represented by a function that takes a string array of arguments and a callback to
 be invoked when the switch processing has completed. The only argument to the callback is an error code, or null
@@ -247,3 +228,25 @@ var commandLineSwitches = {
 	}
 };
 
+var processNextSwitch = function() {
+	if(currSwitch < switches.length) {
+		var s = switches[currSwitch++],
+			csw = commandLineSwitches[s.switchName];
+		if(s.args.length < csw.args.min) {
+			throw "Command line switch --" + s.switchName + " should have a minimum of " + csw.args.min + " arguments";
+		}
+		if(s.args.length > csw.args.max) {
+			throw "Command line switch --" + s.switchName + " should have a maximum of " + csw.args.max + " arguments";
+		}
+		csw.handler(s.args,function (err) {
+			if(err) {
+				throw err;
+			}
+			process.nextTick(processNextSwitch);
+		});
+	}
+};
+
+process.nextTick(processNextSwitch);
+
+})();
diff --git a/wikitest.js b/wikitest.js
index 3c405b274..834810c8c 100644
--- a/wikitest.js
+++ b/wikitest.js
@@ -1,3 +1,5 @@
+(function(){
+
 /*
 Wikifier test rig
 
@@ -61,3 +63,5 @@ for(t=0; t<titles.length; t++) {
 		console.error("Tiddler %s plain text error\nTarget: %s\nFound: %s\n",titles[t],plainTarget,plainRender);
 	}
 }
+
+})();