diff --git a/js/macros/echo.js b/js/macros/echo.js
index 80c7ecb4e..dcf9385dc 100644
--- a/js/macros/echo.js
+++ b/js/macros/echo.js
@@ -11,7 +11,6 @@ var Renderer = require("../Renderer.js").Renderer;
 
 exports.macro = {
 	name: "echo",
-	types: ["text/html","text/plain"],
 	params: {
 		text: {byPos: 0, type: "text"}
 	},
diff --git a/js/macros/image.js b/js/macros/image.js
index ebd655547..972d0e4c1 100644
--- a/js/macros/image.js
+++ b/js/macros/image.js
@@ -11,7 +11,6 @@ var Renderer = require("../Renderer.js").Renderer;
 
 exports.macro = {
 	name: "image",
-	types: ["text/html","text/plain"],
 	params: {
 		src: {byName: "default", type: "tiddler"},
 		text: {byName: true, type: "text"},
diff --git a/js/macros/link.js b/js/macros/link.js
index 002e01313..aa793202c 100644
--- a/js/macros/link.js
+++ b/js/macros/link.js
@@ -16,7 +16,6 @@ var isLinkExternal = function(target) {
 
 exports.macro = {
 	name: "link",
-	types: ["text/html","text/plain"],
 	params: {
 		target: {byName: "default", type: "tiddler", skinny: true}
 	},
diff --git a/js/macros/list.js b/js/macros/list.js
index 0bbe67040..56c961eda 100644
--- a/js/macros/list.js
+++ b/js/macros/list.js
@@ -34,7 +34,6 @@ var handlers = {
 
 exports.macro = {
 	name: "list",
-	types: ["text/html","text/plain"],
 	dependentAll: true, // Tiddlers containing <<list>> macro are dependent on every tiddler
 	params: {
 		type: {byName: "default", type: "text"},
diff --git a/js/macros/slider.js b/js/macros/slider.js
index f041f2634..c1bbc7e67 100644
--- a/js/macros/slider.js
+++ b/js/macros/slider.js
@@ -32,47 +32,45 @@ var Renderer = require("../Renderer.js").Renderer,
 	Tiddler = require("../Tiddler.js").Tiddler,
 	utils = require("../Utils.js");
 
-
-function getOpenState() {
-	if(this.params.hasOwnProperty("state")) {
-		var stateTiddler = this.store.getTiddler(this.params.state);
+function getOpenState(macroNode) {
+	if(macroNode.params.hasOwnProperty("state")) {
+		var stateTiddler = macroNode.store.getTiddler(macroNode.params.state);
 		if(stateTiddler) {
 			return stateTiddler.text.trim() === "open";
 		}
 	}
-	if(this.params.hasOwnProperty("default")) {
-		return this.params["default"] === "open";
+	if(macroNode.params.hasOwnProperty("default")) {
+		return macroNode.params["default"] === "open";
 	}
 	return false;
-};
+}
 
-function saveOpenState() {
-	if(this.params.hasOwnProperty("state")) {
-		var stateTiddler = this.store.getTiddler(this.params.state) ||
-							new Tiddler({title: this.params.state, text: ""});
-		this.store.addTiddler(new Tiddler(stateTiddler,{text: this.isOpen ? "open" : "closed"}));
+function saveOpenState(macroNode) {
+	if(macroNode.params.hasOwnProperty("state")) {
+		var stateTiddler = macroNode.store.getTiddler(macroNode.params.state) ||
+							new Tiddler({title: macroNode.params.state, text: ""});
+		macroNode.store.addTiddler(new Tiddler(stateTiddler,{text: macroNode.isOpen ? "open" : "closed"}));
 		return true;
 	}
 	return false;
 }
 
-function getSliderContent() {
-	if(this.params.hasOwnProperty("content")) {
-		return this.store.parseText("text/x-tiddlywiki",this.params.content).nodes;
-	} else if(this.params.hasOwnProperty("target")) {
+function getSliderContent(macroNode) {
+	if(macroNode.params.hasOwnProperty("content")) {
+		return macroNode.store.parseText("text/x-tiddlywiki",macroNode.params.content).nodes;
+	} else if(macroNode.params.hasOwnProperty("target")) {
 		return [Renderer.MacroNode(
 								"tiddler",
-								{target: this.params.target},
+								{target: macroNode.params.target},
 								null,
-								this.store)];
+								macroNode.store)];
 	} else {
 		return [Renderer.ErrorNode("No content specified for slider")];
 	}
-};
+}
 
 exports.macro = {
 	name: "slider",
-	types: ["text/html","text/plain"],
 	params: {
 		state: {byPos: 0, type: "tiddler"},
 		"default": {byName: true, type: "text"},
diff --git a/js/macros/story.js b/js/macros/story.js
index b2641c2a3..a4517f852 100644
--- a/js/macros/story.js
+++ b/js/macros/story.js
@@ -27,7 +27,6 @@ var parseStory = function(storyText) {
 
 exports.macro = {
 	name: "story",
-	types: ["text/html","text/plain"],
 	params: {
 		story: {byName: "default", type: "tiddler"},
 		template: {byName: true, type: "tiddler"}
diff --git a/js/macros/tiddler.js b/js/macros/tiddler.js
index 89c907ed9..7f264a2e6 100644
--- a/js/macros/tiddler.js
+++ b/js/macros/tiddler.js
@@ -46,7 +46,6 @@ var Renderer = require("../Renderer.js").Renderer;
 
 exports.macro = {
 	name: "tiddler",
-	types: ["text/html","text/plain"],
 	cascadeParams: true, // Cascade names of named parameters to following anonymous parameters
 	params: {
 		target: {byName: "default", type: "tiddler"},
diff --git a/js/macros/version.js b/js/macros/version.js
index 54ebdd3bb..9495cd709 100644
--- a/js/macros/version.js
+++ b/js/macros/version.js
@@ -11,7 +11,6 @@ var Renderer = require("../Renderer.js").Renderer;
 
 exports.macro = {
 	name: "version",
-	types: ["text/html","text/plain"],
 	params: {
 	},
 	execute: function() {
diff --git a/js/macros/video.js b/js/macros/video.js
index be5ca89a3..ce00fc09a 100644
--- a/js/macros/video.js
+++ b/js/macros/video.js
@@ -11,7 +11,6 @@ var Renderer = require("../Renderer.js").Renderer;
 
 exports.macro = {
 	name: "video",
-	types: ["text/html","text/plain"],
 	params: {
 		src: {byName: "default", type: "text"},
 		type: {byName: true, type: "text"},
diff --git a/js/macros/view.js b/js/macros/view.js
index 68919984c..68aac0942 100644
--- a/js/macros/view.js
+++ b/js/macros/view.js
@@ -13,7 +13,6 @@ var Renderer = require("../Renderer.js").Renderer,
 
 exports.macro = {
 	name: "view",
-	types: ["text/html","text/plain"],
 	params: {
 		field: {byPos: 0, type: "text"},
 		format: {byPos: 1, type: "text"},