From 202411e70d45805712171c0903abdc2ad811019e Mon Sep 17 00:00:00 2001
From: Alexander Guinness <monolithed@gmail.com>
Date: Thu, 10 Oct 2013 23:21:47 +0400
Subject: [PATCH 1/4] refactoring

---
 lib/compile_tmpl.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/compile_tmpl.js b/lib/compile_tmpl.js
index e4924a2..bebdec9 100644
--- a/lib/compile_tmpl.js
+++ b/lib/compile_tmpl.js
@@ -1,9 +1,11 @@
 function compile_tmpl(file, source, wrapper) {
+	var fest = "var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['##file##']=##source##;";
+
 	var wrappers = {
-		fest: ";(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['##file##']=##source##})();",
-		loader: ";(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['##file##']=##source##; if(x.jsLoader!==undefined&&x.jsLoader.loaded!==undefined&&typeof x.jsLoader.loaded==='function'){x.jsLoader.loaded('{festTemplate}##file##')};})();",
-		source: "##source##",
-		amd: "define(function(){return ##source##});",
+		fest:     ";(function(){" + fest + "})();",
+		loader:   ";(function(){" + fest + "if(x.jsLoader!==undefined&&x.jsLoader.loaded!==undefined&&typeof x.jsLoader.loaded==='function'){x.jsLoader.loaded('{festTemplate}##file##')};})();",
+		source:   "##source##",
+		amd:      "define(function(){return##source##});",
 		variable: "var ##file##=##source##;"
 	};
 
@@ -12,10 +14,10 @@ function compile_tmpl(file, source, wrapper) {
 		file = file.replace(/.*\//g, '');
 	}
 
-	file = file.replace(/\'/g, "\\'").replace(/\"/g, '\\"').replace(/\\/g, '\\');
+	file = file.replace(/['"\\]/g, '\\$&');
 	return wrappers[wrapper || 'fest'].replace(/##file##/g, file).replace(/##source##/g, source);
 }
 
-if (typeof module !== 'undefined' && module.exports){
+if (typeof module !== 'undefined' && module.exports) {
 	module.exports = compile_tmpl;
 }

From 57ba1d8c004d0e988eca14f2bb2a5822ce29ac40 Mon Sep 17 00:00:00 2001
From: Alexander Guinness <monolithed@gmail.com>
Date: Fri, 11 Oct 2013 12:59:10 +0400
Subject: [PATCH 2/4] tests

---
 spec/expected/build/initial/attribute.js                      | 4 ++--
 spec/expected/build/initial/attribute_expression.js           | 4 ++--
 spec/expected/build/initial/block_for_include.js              | 4 ++--
 spec/expected/build/initial/block_unsuspected_recursion.js    | 4 ++--
 spec/expected/build/initial/block_with_include.js             | 4 ++--
 spec/expected/build/initial/block_with_params.js              | 4 ++--
 spec/expected/build/initial/blocks.js                         | 4 ++--
 spec/expected/build/initial/call.js                           | 4 ++--
 spec/expected/build/initial/cdata.js                          | 4 ++--
 spec/expected/build/initial/choose.js                         | 4 ++--
 spec/expected/build/initial/comment.js                        | 4 ++--
 spec/expected/build/initial/doctype.js                        | 4 ++--
 spec/expected/build/initial/each.js                           | 4 ++--
 spec/expected/build/initial/element.js                        | 4 ++--
 spec/expected/build/initial/for.js                            | 4 ++--
 spec/expected/build/initial/if.js                             | 4 ++--
 spec/expected/build/initial/include.js                        | 4 ++--
 spec/expected/build/initial/include_foreach.js                | 4 ++--
 spec/expected/build/initial/insert.js                         | 4 ++--
 spec/expected/build/initial/intercept.js                      | 4 ++--
 spec/expected/build/initial/issue_64.js                       | 4 ++--
 spec/expected/build/initial/message.js                        | 4 ++--
 spec/expected/build/initial/params.js                         | 4 ++--
 spec/expected/build/initial/plural.js                         | 4 ++--
 spec/expected/build/initial/plural_english.js                 | 4 ++--
 spec/expected/build/initial/plural_escape.js                  | 4 ++--
 spec/expected/build/initial/script.js                         | 4 ++--
 spec/expected/build/initial/set_bar.js                        | 4 ++--
 spec/expected/build/initial/set_params.js                     | 4 ++--
 spec/expected/build/initial/set_params_inner.js               | 4 ++--
 spec/expected/build/initial/short_tag.js                      | 4 ++--
 spec/expected/build/initial/strict.js                         | 4 ++--
 spec/expected/build/initial/text.js                           | 4 ++--
 spec/expected/build/initial/useless_set.js                    | 4 ++--
 spec/expected/build/initial/useless_set_include.js            | 4 ++--
 spec/expected/build/initial/useless_set_select.js             | 4 ++--
 spec/expected/build/initial/value.js                          | 4 ++--
 spec/expected/build/initial/var.js                            | 4 ++--
 spec/expected/build/initial/xss.js                            | 4 ++--
 spec/expected/build/translated/attribute.en_US.js             | 4 ++--
 spec/expected/build/translated/attribute_expression.en_US.js  | 4 ++--
 spec/expected/build/translated/block_for_include.en_US.js     | 4 ++--
 .../build/translated/block_unsuspected_recursion.en_US.js     | 4 ++--
 spec/expected/build/translated/block_with_include.en_US.js    | 4 ++--
 spec/expected/build/translated/block_with_params.en_US.js     | 4 ++--
 spec/expected/build/translated/blocks.en_US.js                | 4 ++--
 spec/expected/build/translated/call.en_US.js                  | 4 ++--
 spec/expected/build/translated/cdata.en_US.js                 | 4 ++--
 spec/expected/build/translated/choose.en_US.js                | 4 ++--
 spec/expected/build/translated/comment.en_US.js               | 4 ++--
 spec/expected/build/translated/doctype.en_US.js               | 4 ++--
 spec/expected/build/translated/each.en_US.js                  | 4 ++--
 spec/expected/build/translated/element.en_US.js               | 4 ++--
 spec/expected/build/translated/for.en_US.js                   | 4 ++--
 spec/expected/build/translated/if.en_US.js                    | 4 ++--
 spec/expected/build/translated/include.en_US.js               | 4 ++--
 spec/expected/build/translated/include_foreach.en_US.js       | 4 ++--
 spec/expected/build/translated/insert.en_US.js                | 4 ++--
 spec/expected/build/translated/intercept.en_US.js             | 4 ++--
 spec/expected/build/translated/issue_64.en_US.js              | 4 ++--
 spec/expected/build/translated/message.en_US.js               | 4 ++--
 spec/expected/build/translated/params.en_US.js                | 4 ++--
 spec/expected/build/translated/plural.en_US.js                | 4 ++--
 spec/expected/build/translated/plural_english.en_US.js        | 4 ++--
 spec/expected/build/translated/plural_escape.en_US.js         | 4 ++--
 spec/expected/build/translated/script.en_US.js                | 4 ++--
 spec/expected/build/translated/set_bar.en_US.js               | 4 ++--
 spec/expected/build/translated/set_params.en_US.js            | 4 ++--
 spec/expected/build/translated/set_params_inner.en_US.js      | 4 ++--
 spec/expected/build/translated/short_tag.en_US.js             | 4 ++--
 spec/expected/build/translated/strict.en_US.js                | 4 ++--
 spec/expected/build/translated/text.en_US.js                  | 4 ++--
 spec/expected/build/translated/useless_set.en_US.js           | 4 ++--
 spec/expected/build/translated/useless_set_include.en_US.js   | 4 ++--
 spec/expected/build/translated/useless_set_select.en_US.js    | 4 ++--
 spec/expected/build/translated/value.en_US.js                 | 4 ++--
 spec/expected/build/translated/var.en_US.js                   | 4 ++--
 spec/expected/build/translated/xss.en_US.js                   | 4 ++--
 spec/expected/compile/initial/attribute.js                    | 4 ++--
 spec/expected/compile/initial/attribute_expression.js         | 4 ++--
 spec/expected/compile/initial/block_for_include.js            | 4 ++--
 spec/expected/compile/initial/block_unsuspected_recursion.js  | 4 ++--
 spec/expected/compile/initial/block_with_include.js           | 4 ++--
 spec/expected/compile/initial/block_with_params.js            | 4 ++--
 spec/expected/compile/initial/blocks.js                       | 4 ++--
 spec/expected/compile/initial/call.js                         | 4 ++--
 spec/expected/compile/initial/cdata.js                        | 4 ++--
 spec/expected/compile/initial/choose.js                       | 4 ++--
 spec/expected/compile/initial/comment.js                      | 4 ++--
 spec/expected/compile/initial/doctype.js                      | 4 ++--
 spec/expected/compile/initial/each.js                         | 4 ++--
 spec/expected/compile/initial/element.js                      | 4 ++--
 spec/expected/compile/initial/for.js                          | 4 ++--
 spec/expected/compile/initial/if.js                           | 4 ++--
 spec/expected/compile/initial/include.js                      | 4 ++--
 spec/expected/compile/initial/include_foreach.js              | 4 ++--
 spec/expected/compile/initial/insert.js                       | 4 ++--
 spec/expected/compile/initial/intercept.js                    | 4 ++--
 spec/expected/compile/initial/issue_64.js                     | 4 ++--
 spec/expected/compile/initial/message.js                      | 4 ++--
 spec/expected/compile/initial/params.js                       | 4 ++--
 spec/expected/compile/initial/plural.js                       | 4 ++--
 spec/expected/compile/initial/plural_english.js               | 4 ++--
 spec/expected/compile/initial/plural_escape.js                | 4 ++--
 spec/expected/compile/initial/script.js                       | 4 ++--
 spec/expected/compile/initial/set_bar.js                      | 4 ++--
 spec/expected/compile/initial/set_params.js                   | 4 ++--
 spec/expected/compile/initial/set_params_inner.js             | 4 ++--
 spec/expected/compile/initial/short_tag.js                    | 4 ++--
 spec/expected/compile/initial/strict.js                       | 4 ++--
 spec/expected/compile/initial/text.js                         | 4 ++--
 spec/expected/compile/initial/useless_set.js                  | 4 ++--
 spec/expected/compile/initial/useless_set_include.js          | 4 ++--
 spec/expected/compile/initial/useless_set_select.js           | 4 ++--
 spec/expected/compile/initial/value.js                        | 4 ++--
 spec/expected/compile/initial/var.js                          | 4 ++--
 spec/expected/compile/initial/xss.js                          | 4 ++--
 spec/expected/compile/translated/attribute.en_US.js           | 4 ++--
 .../expected/compile/translated/attribute_expression.en_US.js | 4 ++--
 spec/expected/compile/translated/block_for_include.en_US.js   | 4 ++--
 .../compile/translated/block_unsuspected_recursion.en_US.js   | 4 ++--
 spec/expected/compile/translated/block_with_include.en_US.js  | 4 ++--
 spec/expected/compile/translated/block_with_params.en_US.js   | 4 ++--
 spec/expected/compile/translated/blocks.en_US.js              | 4 ++--
 spec/expected/compile/translated/call.en_US.js                | 4 ++--
 spec/expected/compile/translated/cdata.en_US.js               | 4 ++--
 spec/expected/compile/translated/choose.en_US.js              | 4 ++--
 spec/expected/compile/translated/comment.en_US.js             | 4 ++--
 spec/expected/compile/translated/doctype.en_US.js             | 4 ++--
 spec/expected/compile/translated/each.en_US.js                | 4 ++--
 spec/expected/compile/translated/element.en_US.js             | 4 ++--
 spec/expected/compile/translated/for.en_US.js                 | 4 ++--
 spec/expected/compile/translated/if.en_US.js                  | 4 ++--
 spec/expected/compile/translated/include.en_US.js             | 4 ++--
 spec/expected/compile/translated/include_foreach.en_US.js     | 4 ++--
 spec/expected/compile/translated/insert.en_US.js              | 4 ++--
 spec/expected/compile/translated/intercept.en_US.js           | 4 ++--
 spec/expected/compile/translated/issue_64.en_US.js            | 4 ++--
 spec/expected/compile/translated/message.en_US.js             | 4 ++--
 spec/expected/compile/translated/params.en_US.js              | 4 ++--
 spec/expected/compile/translated/plural.en_US.js              | 4 ++--
 spec/expected/compile/translated/plural_english.en_US.js      | 4 ++--
 spec/expected/compile/translated/plural_escape.en_US.js       | 4 ++--
 spec/expected/compile/translated/script.en_US.js              | 4 ++--
 spec/expected/compile/translated/set_bar.en_US.js             | 4 ++--
 spec/expected/compile/translated/set_params.en_US.js          | 4 ++--
 spec/expected/compile/translated/set_params_inner.en_US.js    | 4 ++--
 spec/expected/compile/translated/short_tag.en_US.js           | 4 ++--
 spec/expected/compile/translated/strict.en_US.js              | 4 ++--
 spec/expected/compile/translated/text.en_US.js                | 4 ++--
 spec/expected/compile/translated/useless_set.en_US.js         | 4 ++--
 spec/expected/compile/translated/useless_set_include.en_US.js | 4 ++--
 spec/expected/compile/translated/useless_set_select.en_US.js  | 4 ++--
 spec/expected/compile/translated/value.en_US.js               | 4 ++--
 spec/expected/compile/translated/var.en_US.js                 | 4 ++--
 spec/expected/compile/translated/xss.en_US.js                 | 4 ++--
 156 files changed, 312 insertions(+), 312 deletions(-)

diff --git a/spec/expected/build/initial/attribute.js b/spec/expected/build/initial/attribute.js
index 2589857..a4611b2 100644
--- a/spec/expected/build/initial/attribute.js
+++ b/spec/expected/build/initial/attribute.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['attribute']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['attribute']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -207,4 +207,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/attribute_expression.js b/spec/expected/build/initial/attribute_expression.js
index 4e86983..a1e47a4 100644
--- a/spec/expected/build/initial/attribute_expression.js
+++ b/spec/expected/build/initial/attribute_expression.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['attribute_expression']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['attribute_expression']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -298,4 +298,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/block_for_include.js b/spec/expected/build/initial/block_for_include.js
index 35dba00..88e4a9c 100644
--- a/spec/expected/build/initial/block_for_include.js
+++ b/spec/expected/build/initial/block_for_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['block_for_include']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_for_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -118,4 +118,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/block_unsuspected_recursion.js b/spec/expected/build/initial/block_unsuspected_recursion.js
index c9b824d..1824f24 100644
--- a/spec/expected/build/initial/block_unsuspected_recursion.js
+++ b/spec/expected/build/initial/block_unsuspected_recursion.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['block_unsuspected_recursion']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_unsuspected_recursion']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/block_with_include.js b/spec/expected/build/initial/block_with_include.js
index 740b0aa..0c5b46b 100644
--- a/spec/expected/build/initial/block_with_include.js
+++ b/spec/expected/build/initial/block_with_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['block_with_include']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_with_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -134,4 +134,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/block_with_params.js b/spec/expected/build/initial/block_with_params.js
index 444b59c..9cbbff1 100644
--- a/spec/expected/build/initial/block_with_params.js
+++ b/spec/expected/build/initial/block_with_params.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['block_with_params']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_with_params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -282,4 +282,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/blocks.js b/spec/expected/build/initial/blocks.js
index 0ac644e..8215e31 100644
--- a/spec/expected/build/initial/blocks.js
+++ b/spec/expected/build/initial/blocks.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['blocks']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['blocks']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -366,4 +366,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/call.js b/spec/expected/build/initial/call.js
index 07bb607..309fb0f 100644
--- a/spec/expected/build/initial/call.js
+++ b/spec/expected/build/initial/call.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['call']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['call']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -121,4 +121,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/cdata.js b/spec/expected/build/initial/cdata.js
index f93c0ea..270e7e4 100644
--- a/spec/expected/build/initial/cdata.js
+++ b/spec/expected/build/initial/cdata.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['cdata']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['cdata']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/choose.js b/spec/expected/build/initial/choose.js
index a07f55c..2aabe94 100644
--- a/spec/expected/build/initial/choose.js
+++ b/spec/expected/build/initial/choose.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['choose']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['choose']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/comment.js b/spec/expected/build/initial/comment.js
index bc3ccba..db8a3b3 100644
--- a/spec/expected/build/initial/comment.js
+++ b/spec/expected/build/initial/comment.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['comment']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['comment']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/doctype.js b/spec/expected/build/initial/doctype.js
index 11c9f4c..b51475e 100644
--- a/spec/expected/build/initial/doctype.js
+++ b/spec/expected/build/initial/doctype.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['doctype']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['doctype']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/each.js b/spec/expected/build/initial/each.js
index ea882eb..e1e3dc7 100644
--- a/spec/expected/build/initial/each.js
+++ b/spec/expected/build/initial/each.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['each']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['each']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -157,4 +157,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/element.js b/spec/expected/build/initial/element.js
index 16c9799..ec828bc 100644
--- a/spec/expected/build/initial/element.js
+++ b/spec/expected/build/initial/element.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['element']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['element']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -475,4 +475,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/for.js b/spec/expected/build/initial/for.js
index e900af4..9889e5c 100644
--- a/spec/expected/build/initial/for.js
+++ b/spec/expected/build/initial/for.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['for']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['for']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -190,4 +190,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/if.js b/spec/expected/build/initial/if.js
index 00214dc..ee3a31a 100644
--- a/spec/expected/build/initial/if.js
+++ b/spec/expected/build/initial/if.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['if']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['if']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/include.js b/spec/expected/build/initial/include.js
index f7cb284..fafaa32 100644
--- a/spec/expected/build/initial/include.js
+++ b/spec/expected/build/initial/include.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['include']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -156,4 +156,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/include_foreach.js b/spec/expected/build/initial/include_foreach.js
index b193fa1..fdeb34e 100644
--- a/spec/expected/build/initial/include_foreach.js
+++ b/spec/expected/build/initial/include_foreach.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['include_foreach']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['include_foreach']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -126,4 +126,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/insert.js b/spec/expected/build/initial/insert.js
index 7751046..83ae206 100644
--- a/spec/expected/build/initial/insert.js
+++ b/spec/expected/build/initial/insert.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['insert']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['insert']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/intercept.js b/spec/expected/build/initial/intercept.js
index 438bf43..c0dd915 100644
--- a/spec/expected/build/initial/intercept.js
+++ b/spec/expected/build/initial/intercept.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['intercept']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['intercept']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/issue_64.js b/spec/expected/build/initial/issue_64.js
index 6aef0c9..0727bf8 100644
--- a/spec/expected/build/initial/issue_64.js
+++ b/spec/expected/build/initial/issue_64.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['issue_64']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['issue_64']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/message.js b/spec/expected/build/initial/message.js
index 423edfb..5039c37 100644
--- a/spec/expected/build/initial/message.js
+++ b/spec/expected/build/initial/message.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['message']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['message']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/params.js b/spec/expected/build/initial/params.js
index 2e0c8b1..0f712a3 100644
--- a/spec/expected/build/initial/params.js
+++ b/spec/expected/build/initial/params.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['params']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -135,4 +135,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/plural.js b/spec/expected/build/initial/plural.js
index 3e39e93..f78dab8 100644
--- a/spec/expected/build/initial/plural.js
+++ b/spec/expected/build/initial/plural.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['plural']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/plural_english.js b/spec/expected/build/initial/plural_english.js
index 025e7a1..5278565 100644
--- a/spec/expected/build/initial/plural_english.js
+++ b/spec/expected/build/initial/plural_english.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['plural_english']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural_english']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/plural_escape.js b/spec/expected/build/initial/plural_escape.js
index 34db754..a09f51d 100644
--- a/spec/expected/build/initial/plural_escape.js
+++ b/spec/expected/build/initial/plural_escape.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['plural_escape']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural_escape']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -136,4 +136,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/script.js b/spec/expected/build/initial/script.js
index f171d1a..a97649e 100644
--- a/spec/expected/build/initial/script.js
+++ b/spec/expected/build/initial/script.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['script']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['script']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -133,4 +133,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/set_bar.js b/spec/expected/build/initial/set_bar.js
index fa093cd..2c31f1e 100644
--- a/spec/expected/build/initial/set_bar.js
+++ b/spec/expected/build/initial/set_bar.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['set_bar']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_bar']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/set_params.js b/spec/expected/build/initial/set_params.js
index 39d774a..5c381a6 100644
--- a/spec/expected/build/initial/set_params.js
+++ b/spec/expected/build/initial/set_params.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['set_params']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -270,4 +270,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/set_params_inner.js b/spec/expected/build/initial/set_params_inner.js
index f3712b0..7a34959 100644
--- a/spec/expected/build/initial/set_params_inner.js
+++ b/spec/expected/build/initial/set_params_inner.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['set_params_inner']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_params_inner']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/short_tag.js b/spec/expected/build/initial/short_tag.js
index 1f86cf1..8f0ca80 100644
--- a/spec/expected/build/initial/short_tag.js
+++ b/spec/expected/build/initial/short_tag.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['short_tag']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['short_tag']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/strict.js b/spec/expected/build/initial/strict.js
index 74a13d1..f1214fb 100644
--- a/spec/expected/build/initial/strict.js
+++ b/spec/expected/build/initial/strict.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['strict']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['strict']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -125,4 +125,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/text.js b/spec/expected/build/initial/text.js
index 85e1559..5c7a223 100644
--- a/spec/expected/build/initial/text.js
+++ b/spec/expected/build/initial/text.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['text']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['text']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/useless_set.js b/spec/expected/build/initial/useless_set.js
index f56ee11..1f8a1ac 100644
--- a/spec/expected/build/initial/useless_set.js
+++ b/spec/expected/build/initial/useless_set.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['useless_set']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -125,4 +125,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/useless_set_include.js b/spec/expected/build/initial/useless_set_include.js
index c16cdf2..db7e0a4 100644
--- a/spec/expected/build/initial/useless_set_include.js
+++ b/spec/expected/build/initial/useless_set_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['useless_set_include']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/useless_set_select.js b/spec/expected/build/initial/useless_set_select.js
index a0d027e..608368a 100644
--- a/spec/expected/build/initial/useless_set_select.js
+++ b/spec/expected/build/initial/useless_set_select.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['useless_set_select']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set_select']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -160,4 +160,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/value.js b/spec/expected/build/initial/value.js
index 2b59d96..8e7b593 100644
--- a/spec/expected/build/initial/value.js
+++ b/spec/expected/build/initial/value.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['value']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['value']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -171,4 +171,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/var.js b/spec/expected/build/initial/var.js
index fd4a014..7950937 100644
--- a/spec/expected/build/initial/var.js
+++ b/spec/expected/build/initial/var.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['var']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['var']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -134,4 +134,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/initial/xss.js b/spec/expected/build/initial/xss.js
index b5aadd6..1550830 100644
--- a/spec/expected/build/initial/xss.js
+++ b/spec/expected/build/initial/xss.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['xss']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['xss']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -116,4 +116,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/attribute.en_US.js b/spec/expected/build/translated/attribute.en_US.js
index 0ff9a55..fd7f3d7 100644
--- a/spec/expected/build/translated/attribute.en_US.js
+++ b/spec/expected/build/translated/attribute.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['attribute.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['attribute.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -207,4 +207,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/attribute_expression.en_US.js b/spec/expected/build/translated/attribute_expression.en_US.js
index 1faff45..e7f325e 100644
--- a/spec/expected/build/translated/attribute_expression.en_US.js
+++ b/spec/expected/build/translated/attribute_expression.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['attribute_expression.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['attribute_expression.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -298,4 +298,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/block_for_include.en_US.js b/spec/expected/build/translated/block_for_include.en_US.js
index b0c17e3..f7aa4e0 100644
--- a/spec/expected/build/translated/block_for_include.en_US.js
+++ b/spec/expected/build/translated/block_for_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['block_for_include.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_for_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -118,4 +118,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/block_unsuspected_recursion.en_US.js b/spec/expected/build/translated/block_unsuspected_recursion.en_US.js
index b9b5840..624e91d 100644
--- a/spec/expected/build/translated/block_unsuspected_recursion.en_US.js
+++ b/spec/expected/build/translated/block_unsuspected_recursion.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['block_unsuspected_recursion.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_unsuspected_recursion.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/block_with_include.en_US.js b/spec/expected/build/translated/block_with_include.en_US.js
index bb5b5bc..4fb760c 100644
--- a/spec/expected/build/translated/block_with_include.en_US.js
+++ b/spec/expected/build/translated/block_with_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['block_with_include.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_with_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -134,4 +134,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/block_with_params.en_US.js b/spec/expected/build/translated/block_with_params.en_US.js
index 6c44abc..e01bb68 100644
--- a/spec/expected/build/translated/block_with_params.en_US.js
+++ b/spec/expected/build/translated/block_with_params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['block_with_params.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_with_params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -282,4 +282,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/blocks.en_US.js b/spec/expected/build/translated/blocks.en_US.js
index 9f6be68..d8aec9b 100644
--- a/spec/expected/build/translated/blocks.en_US.js
+++ b/spec/expected/build/translated/blocks.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['blocks.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['blocks.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -366,4 +366,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/call.en_US.js b/spec/expected/build/translated/call.en_US.js
index 77fe13d..05089c1 100644
--- a/spec/expected/build/translated/call.en_US.js
+++ b/spec/expected/build/translated/call.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['call.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['call.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -121,4 +121,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/cdata.en_US.js b/spec/expected/build/translated/cdata.en_US.js
index 926cd28..5a1c84f 100644
--- a/spec/expected/build/translated/cdata.en_US.js
+++ b/spec/expected/build/translated/cdata.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['cdata.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['cdata.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/choose.en_US.js b/spec/expected/build/translated/choose.en_US.js
index 334be8f..fb194b8 100644
--- a/spec/expected/build/translated/choose.en_US.js
+++ b/spec/expected/build/translated/choose.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['choose.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['choose.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/comment.en_US.js b/spec/expected/build/translated/comment.en_US.js
index 3ac279e..382a71f 100644
--- a/spec/expected/build/translated/comment.en_US.js
+++ b/spec/expected/build/translated/comment.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['comment.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['comment.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/doctype.en_US.js b/spec/expected/build/translated/doctype.en_US.js
index bfb8a26..8cffd2b 100644
--- a/spec/expected/build/translated/doctype.en_US.js
+++ b/spec/expected/build/translated/doctype.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['doctype.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['doctype.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/each.en_US.js b/spec/expected/build/translated/each.en_US.js
index b1d7d7a..53d316f 100644
--- a/spec/expected/build/translated/each.en_US.js
+++ b/spec/expected/build/translated/each.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['each.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['each.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -157,4 +157,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/element.en_US.js b/spec/expected/build/translated/element.en_US.js
index 02b1360..778a429 100644
--- a/spec/expected/build/translated/element.en_US.js
+++ b/spec/expected/build/translated/element.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['element.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['element.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -475,4 +475,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/for.en_US.js b/spec/expected/build/translated/for.en_US.js
index 7f277e8..f14d5b3 100644
--- a/spec/expected/build/translated/for.en_US.js
+++ b/spec/expected/build/translated/for.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['for.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['for.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -190,4 +190,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/if.en_US.js b/spec/expected/build/translated/if.en_US.js
index 62fff88..04facc7 100644
--- a/spec/expected/build/translated/if.en_US.js
+++ b/spec/expected/build/translated/if.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['if.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['if.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/include.en_US.js b/spec/expected/build/translated/include.en_US.js
index 23d6d55..8ccf110 100644
--- a/spec/expected/build/translated/include.en_US.js
+++ b/spec/expected/build/translated/include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['include.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -156,4 +156,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/include_foreach.en_US.js b/spec/expected/build/translated/include_foreach.en_US.js
index 05f1c7f..85da317 100644
--- a/spec/expected/build/translated/include_foreach.en_US.js
+++ b/spec/expected/build/translated/include_foreach.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['include_foreach.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['include_foreach.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -126,4 +126,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/insert.en_US.js b/spec/expected/build/translated/insert.en_US.js
index 73dbc1c..42edf98 100644
--- a/spec/expected/build/translated/insert.en_US.js
+++ b/spec/expected/build/translated/insert.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['insert.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['insert.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/intercept.en_US.js b/spec/expected/build/translated/intercept.en_US.js
index 3f6195d..7aa6553 100644
--- a/spec/expected/build/translated/intercept.en_US.js
+++ b/spec/expected/build/translated/intercept.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['intercept.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['intercept.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/issue_64.en_US.js b/spec/expected/build/translated/issue_64.en_US.js
index dca7abc..09c7aaf 100644
--- a/spec/expected/build/translated/issue_64.en_US.js
+++ b/spec/expected/build/translated/issue_64.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['issue_64.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['issue_64.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/message.en_US.js b/spec/expected/build/translated/message.en_US.js
index 5ab74a0..178e25f 100644
--- a/spec/expected/build/translated/message.en_US.js
+++ b/spec/expected/build/translated/message.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['message.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['message.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/params.en_US.js b/spec/expected/build/translated/params.en_US.js
index ca52944..6504d39 100644
--- a/spec/expected/build/translated/params.en_US.js
+++ b/spec/expected/build/translated/params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['params.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -135,4 +135,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/plural.en_US.js b/spec/expected/build/translated/plural.en_US.js
index 818f092..04375f3 100644
--- a/spec/expected/build/translated/plural.en_US.js
+++ b/spec/expected/build/translated/plural.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['plural.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/plural_english.en_US.js b/spec/expected/build/translated/plural_english.en_US.js
index e5b4952..0e74062 100644
--- a/spec/expected/build/translated/plural_english.en_US.js
+++ b/spec/expected/build/translated/plural_english.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['plural_english.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural_english.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/plural_escape.en_US.js b/spec/expected/build/translated/plural_escape.en_US.js
index f088dd8..3e5a247 100644
--- a/spec/expected/build/translated/plural_escape.en_US.js
+++ b/spec/expected/build/translated/plural_escape.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['plural_escape.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural_escape.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -136,4 +136,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/script.en_US.js b/spec/expected/build/translated/script.en_US.js
index a1c92dd..2c1f777 100644
--- a/spec/expected/build/translated/script.en_US.js
+++ b/spec/expected/build/translated/script.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['script.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['script.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -133,4 +133,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/set_bar.en_US.js b/spec/expected/build/translated/set_bar.en_US.js
index 20d9e44..67a68cc 100644
--- a/spec/expected/build/translated/set_bar.en_US.js
+++ b/spec/expected/build/translated/set_bar.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['set_bar.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_bar.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/set_params.en_US.js b/spec/expected/build/translated/set_params.en_US.js
index c10eff4..d5d8370 100644
--- a/spec/expected/build/translated/set_params.en_US.js
+++ b/spec/expected/build/translated/set_params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['set_params.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -270,4 +270,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/set_params_inner.en_US.js b/spec/expected/build/translated/set_params_inner.en_US.js
index c4d52fa..fbd96c0 100644
--- a/spec/expected/build/translated/set_params_inner.en_US.js
+++ b/spec/expected/build/translated/set_params_inner.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['set_params_inner.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_params_inner.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/short_tag.en_US.js b/spec/expected/build/translated/short_tag.en_US.js
index 85c2993..7783eae 100644
--- a/spec/expected/build/translated/short_tag.en_US.js
+++ b/spec/expected/build/translated/short_tag.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['short_tag.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['short_tag.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/strict.en_US.js b/spec/expected/build/translated/strict.en_US.js
index 91dd7b2..aa0d06e 100644
--- a/spec/expected/build/translated/strict.en_US.js
+++ b/spec/expected/build/translated/strict.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['strict.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['strict.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -125,4 +125,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/text.en_US.js b/spec/expected/build/translated/text.en_US.js
index 0cd471b..e6bee52 100644
--- a/spec/expected/build/translated/text.en_US.js
+++ b/spec/expected/build/translated/text.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['text.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['text.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/useless_set.en_US.js b/spec/expected/build/translated/useless_set.en_US.js
index 933f93e..defa2d9 100644
--- a/spec/expected/build/translated/useless_set.en_US.js
+++ b/spec/expected/build/translated/useless_set.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['useless_set.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -125,4 +125,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/useless_set_include.en_US.js b/spec/expected/build/translated/useless_set_include.en_US.js
index 01bee6e..8ffc0cb 100644
--- a/spec/expected/build/translated/useless_set_include.en_US.js
+++ b/spec/expected/build/translated/useless_set_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['useless_set_include.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/useless_set_select.en_US.js b/spec/expected/build/translated/useless_set_select.en_US.js
index 8952f81..453dc7a 100644
--- a/spec/expected/build/translated/useless_set_select.en_US.js
+++ b/spec/expected/build/translated/useless_set_select.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['useless_set_select.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set_select.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -160,4 +160,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/value.en_US.js b/spec/expected/build/translated/value.en_US.js
index 155b0bc..a024b66 100644
--- a/spec/expected/build/translated/value.en_US.js
+++ b/spec/expected/build/translated/value.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['value.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['value.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -171,4 +171,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/var.en_US.js b/spec/expected/build/translated/var.en_US.js
index bfe1fcb..27e0fe7 100644
--- a/spec/expected/build/translated/var.en_US.js
+++ b/spec/expected/build/translated/var.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['var.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['var.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -134,4 +134,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/build/translated/xss.en_US.js b/spec/expected/build/translated/xss.en_US.js
index 2160fa8..5df6741 100644
--- a/spec/expected/build/translated/xss.en_US.js
+++ b/spec/expected/build/translated/xss.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['xss.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['xss.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -116,4 +116,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/attribute.js b/spec/expected/compile/initial/attribute.js
index 5b4a207..03fced0 100644
--- a/spec/expected/compile/initial/attribute.js
+++ b/spec/expected/compile/initial/attribute.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/attribute']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -207,4 +207,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/attribute_expression.js b/spec/expected/compile/initial/attribute_expression.js
index 1370d50..f23d11d 100644
--- a/spec/expected/compile/initial/attribute_expression.js
+++ b/spec/expected/compile/initial/attribute_expression.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/attribute_expression']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute_expression']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -298,4 +298,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/block_for_include.js b/spec/expected/compile/initial/block_for_include.js
index 0d3179c..b801ae7 100644
--- a/spec/expected/compile/initial/block_for_include.js
+++ b/spec/expected/compile/initial/block_for_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/block_for_include']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_for_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -118,4 +118,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/block_unsuspected_recursion.js b/spec/expected/compile/initial/block_unsuspected_recursion.js
index 0e6159c..955d941 100644
--- a/spec/expected/compile/initial/block_unsuspected_recursion.js
+++ b/spec/expected/compile/initial/block_unsuspected_recursion.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/block_unsuspected_recursion']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_unsuspected_recursion']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/block_with_include.js b/spec/expected/compile/initial/block_with_include.js
index b2658df..6587328 100644
--- a/spec/expected/compile/initial/block_with_include.js
+++ b/spec/expected/compile/initial/block_with_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/block_with_include']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -134,4 +134,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/block_with_params.js b/spec/expected/compile/initial/block_with_params.js
index b20e497..fe2be61 100644
--- a/spec/expected/compile/initial/block_with_params.js
+++ b/spec/expected/compile/initial/block_with_params.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/block_with_params']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -282,4 +282,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/blocks.js b/spec/expected/compile/initial/blocks.js
index ac5dfb2..a7576e9 100644
--- a/spec/expected/compile/initial/blocks.js
+++ b/spec/expected/compile/initial/blocks.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/blocks']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/blocks']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -366,4 +366,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/call.js b/spec/expected/compile/initial/call.js
index 6dfa1d4..b6c1e85 100644
--- a/spec/expected/compile/initial/call.js
+++ b/spec/expected/compile/initial/call.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/call']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/call']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -121,4 +121,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/cdata.js b/spec/expected/compile/initial/cdata.js
index a222e27..c4e46c6 100644
--- a/spec/expected/compile/initial/cdata.js
+++ b/spec/expected/compile/initial/cdata.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/cdata']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/cdata']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/choose.js b/spec/expected/compile/initial/choose.js
index 95cc3e6..415d4c4 100644
--- a/spec/expected/compile/initial/choose.js
+++ b/spec/expected/compile/initial/choose.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/choose']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/choose']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/comment.js b/spec/expected/compile/initial/comment.js
index 11fc9ac..6e38932 100644
--- a/spec/expected/compile/initial/comment.js
+++ b/spec/expected/compile/initial/comment.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/comment']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/comment']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/doctype.js b/spec/expected/compile/initial/doctype.js
index c567220..f80d6f2 100644
--- a/spec/expected/compile/initial/doctype.js
+++ b/spec/expected/compile/initial/doctype.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/doctype']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/doctype']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/each.js b/spec/expected/compile/initial/each.js
index 9168df9..a2aa5aa 100644
--- a/spec/expected/compile/initial/each.js
+++ b/spec/expected/compile/initial/each.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/each']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/each']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -157,4 +157,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/element.js b/spec/expected/compile/initial/element.js
index 101828c..183ff9f 100644
--- a/spec/expected/compile/initial/element.js
+++ b/spec/expected/compile/initial/element.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/element']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/element']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -475,4 +475,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/for.js b/spec/expected/compile/initial/for.js
index a0731a6..145c199 100644
--- a/spec/expected/compile/initial/for.js
+++ b/spec/expected/compile/initial/for.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/for']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/for']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -190,4 +190,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/if.js b/spec/expected/compile/initial/if.js
index c4e6dfd..258eb5a 100644
--- a/spec/expected/compile/initial/if.js
+++ b/spec/expected/compile/initial/if.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/if']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/if']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/include.js b/spec/expected/compile/initial/include.js
index 27199ca..fc39ecd 100644
--- a/spec/expected/compile/initial/include.js
+++ b/spec/expected/compile/initial/include.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/include']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -156,4 +156,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/include_foreach.js b/spec/expected/compile/initial/include_foreach.js
index 621793b..fd7b334 100644
--- a/spec/expected/compile/initial/include_foreach.js
+++ b/spec/expected/compile/initial/include_foreach.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/include_foreach']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/include_foreach']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -126,4 +126,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/insert.js b/spec/expected/compile/initial/insert.js
index a49d909..1887966 100644
--- a/spec/expected/compile/initial/insert.js
+++ b/spec/expected/compile/initial/insert.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/insert']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/insert']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/intercept.js b/spec/expected/compile/initial/intercept.js
index 9d4a148..3b06efb 100644
--- a/spec/expected/compile/initial/intercept.js
+++ b/spec/expected/compile/initial/intercept.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/intercept']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/intercept']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/issue_64.js b/spec/expected/compile/initial/issue_64.js
index 15112ab..5e4394f 100644
--- a/spec/expected/compile/initial/issue_64.js
+++ b/spec/expected/compile/initial/issue_64.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/issue_64']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/issue_64']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/message.js b/spec/expected/compile/initial/message.js
index 934adcd..cfd5d97 100644
--- a/spec/expected/compile/initial/message.js
+++ b/spec/expected/compile/initial/message.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/message']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/message']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/params.js b/spec/expected/compile/initial/params.js
index b2b65fb..591da04 100644
--- a/spec/expected/compile/initial/params.js
+++ b/spec/expected/compile/initial/params.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/params']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -135,4 +135,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/plural.js b/spec/expected/compile/initial/plural.js
index 107315d..faa2399 100644
--- a/spec/expected/compile/initial/plural.js
+++ b/spec/expected/compile/initial/plural.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/plural']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/plural_english.js b/spec/expected/compile/initial/plural_english.js
index cd408f7..b9b5942 100644
--- a/spec/expected/compile/initial/plural_english.js
+++ b/spec/expected/compile/initial/plural_english.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/plural_english']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_english']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/plural_escape.js b/spec/expected/compile/initial/plural_escape.js
index e579dca..9c912d3 100644
--- a/spec/expected/compile/initial/plural_escape.js
+++ b/spec/expected/compile/initial/plural_escape.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/plural_escape']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_escape']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -136,4 +136,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/script.js b/spec/expected/compile/initial/script.js
index 4372745..3c8bd15 100644
--- a/spec/expected/compile/initial/script.js
+++ b/spec/expected/compile/initial/script.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/script']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/script']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -133,4 +133,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/set_bar.js b/spec/expected/compile/initial/set_bar.js
index eee293a..b6192c3 100644
--- a/spec/expected/compile/initial/set_bar.js
+++ b/spec/expected/compile/initial/set_bar.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/set_bar']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_bar']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/set_params.js b/spec/expected/compile/initial/set_params.js
index acf95df..dd270fa 100644
--- a/spec/expected/compile/initial/set_params.js
+++ b/spec/expected/compile/initial/set_params.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/set_params']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -270,4 +270,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/set_params_inner.js b/spec/expected/compile/initial/set_params_inner.js
index ed664e9..d14ba25 100644
--- a/spec/expected/compile/initial/set_params_inner.js
+++ b/spec/expected/compile/initial/set_params_inner.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/set_params_inner']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params_inner']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/short_tag.js b/spec/expected/compile/initial/short_tag.js
index faddc4a..8538a3d 100644
--- a/spec/expected/compile/initial/short_tag.js
+++ b/spec/expected/compile/initial/short_tag.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/short_tag']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/short_tag']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/strict.js b/spec/expected/compile/initial/strict.js
index 3277350..2cf3ee5 100644
--- a/spec/expected/compile/initial/strict.js
+++ b/spec/expected/compile/initial/strict.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/strict']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/strict']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -125,4 +125,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/text.js b/spec/expected/compile/initial/text.js
index 86ca345..ea41f8f 100644
--- a/spec/expected/compile/initial/text.js
+++ b/spec/expected/compile/initial/text.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/text']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/text']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/useless_set.js b/spec/expected/compile/initial/useless_set.js
index 1d1a4af..d5c98b1 100644
--- a/spec/expected/compile/initial/useless_set.js
+++ b/spec/expected/compile/initial/useless_set.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/useless_set']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -125,4 +125,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/useless_set_include.js b/spec/expected/compile/initial/useless_set_include.js
index bcdb5b2..8169e1d 100644
--- a/spec/expected/compile/initial/useless_set_include.js
+++ b/spec/expected/compile/initial/useless_set_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/useless_set_include']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/useless_set_select.js b/spec/expected/compile/initial/useless_set_select.js
index ffd6279..3c77cbc 100644
--- a/spec/expected/compile/initial/useless_set_select.js
+++ b/spec/expected/compile/initial/useless_set_select.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/useless_set_select']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_select']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -160,4 +160,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/value.js b/spec/expected/compile/initial/value.js
index 7551766..37b3629 100644
--- a/spec/expected/compile/initial/value.js
+++ b/spec/expected/compile/initial/value.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/value']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/value']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -171,4 +171,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/var.js b/spec/expected/compile/initial/var.js
index e2ae0a4..fe153a7 100644
--- a/spec/expected/compile/initial/var.js
+++ b/spec/expected/compile/initial/var.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/var']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/var']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -134,4 +134,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/initial/xss.js b/spec/expected/compile/initial/xss.js
index acda0ab..3585c71 100644
--- a/spec/expected/compile/initial/xss.js
+++ b/spec/expected/compile/initial/xss.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/xss']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/xss']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -116,4 +116,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/attribute.en_US.js b/spec/expected/compile/translated/attribute.en_US.js
index 486fe4f..27350d1 100644
--- a/spec/expected/compile/translated/attribute.en_US.js
+++ b/spec/expected/compile/translated/attribute.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/attribute.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -207,4 +207,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/attribute_expression.en_US.js b/spec/expected/compile/translated/attribute_expression.en_US.js
index 7011685..3d9c7bd 100644
--- a/spec/expected/compile/translated/attribute_expression.en_US.js
+++ b/spec/expected/compile/translated/attribute_expression.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/attribute_expression.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute_expression.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -298,4 +298,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/block_for_include.en_US.js b/spec/expected/compile/translated/block_for_include.en_US.js
index 24f551d..01ecec6 100644
--- a/spec/expected/compile/translated/block_for_include.en_US.js
+++ b/spec/expected/compile/translated/block_for_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/block_for_include.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_for_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -118,4 +118,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/block_unsuspected_recursion.en_US.js b/spec/expected/compile/translated/block_unsuspected_recursion.en_US.js
index dfc63f8..b5ed409 100644
--- a/spec/expected/compile/translated/block_unsuspected_recursion.en_US.js
+++ b/spec/expected/compile/translated/block_unsuspected_recursion.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/block_unsuspected_recursion.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_unsuspected_recursion.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/block_with_include.en_US.js b/spec/expected/compile/translated/block_with_include.en_US.js
index b74d4f1..f46fbf2 100644
--- a/spec/expected/compile/translated/block_with_include.en_US.js
+++ b/spec/expected/compile/translated/block_with_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/block_with_include.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -134,4 +134,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/block_with_params.en_US.js b/spec/expected/compile/translated/block_with_params.en_US.js
index 8388013..03e360f 100644
--- a/spec/expected/compile/translated/block_with_params.en_US.js
+++ b/spec/expected/compile/translated/block_with_params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/block_with_params.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -282,4 +282,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/blocks.en_US.js b/spec/expected/compile/translated/blocks.en_US.js
index b955503..e9db8b2 100644
--- a/spec/expected/compile/translated/blocks.en_US.js
+++ b/spec/expected/compile/translated/blocks.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/blocks.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/blocks.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -366,4 +366,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/call.en_US.js b/spec/expected/compile/translated/call.en_US.js
index 8906326..488be4a 100644
--- a/spec/expected/compile/translated/call.en_US.js
+++ b/spec/expected/compile/translated/call.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/call.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/call.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -121,4 +121,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/cdata.en_US.js b/spec/expected/compile/translated/cdata.en_US.js
index 166d7c8..cad82c2 100644
--- a/spec/expected/compile/translated/cdata.en_US.js
+++ b/spec/expected/compile/translated/cdata.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/cdata.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/cdata.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/choose.en_US.js b/spec/expected/compile/translated/choose.en_US.js
index e624f68..5811b05 100644
--- a/spec/expected/compile/translated/choose.en_US.js
+++ b/spec/expected/compile/translated/choose.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/choose.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/choose.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/comment.en_US.js b/spec/expected/compile/translated/comment.en_US.js
index 382e4ba..fb4a4db 100644
--- a/spec/expected/compile/translated/comment.en_US.js
+++ b/spec/expected/compile/translated/comment.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/comment.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/comment.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/doctype.en_US.js b/spec/expected/compile/translated/doctype.en_US.js
index 131c0ab..1591c12 100644
--- a/spec/expected/compile/translated/doctype.en_US.js
+++ b/spec/expected/compile/translated/doctype.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/doctype.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/doctype.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/each.en_US.js b/spec/expected/compile/translated/each.en_US.js
index 2317d4c..e802744 100644
--- a/spec/expected/compile/translated/each.en_US.js
+++ b/spec/expected/compile/translated/each.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/each.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/each.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -157,4 +157,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/element.en_US.js b/spec/expected/compile/translated/element.en_US.js
index cd07215..13eea8b 100644
--- a/spec/expected/compile/translated/element.en_US.js
+++ b/spec/expected/compile/translated/element.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/element.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/element.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -475,4 +475,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/for.en_US.js b/spec/expected/compile/translated/for.en_US.js
index 4544473..9aa3fa1 100644
--- a/spec/expected/compile/translated/for.en_US.js
+++ b/spec/expected/compile/translated/for.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/for.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/for.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -190,4 +190,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/if.en_US.js b/spec/expected/compile/translated/if.en_US.js
index 98348a5..c615211 100644
--- a/spec/expected/compile/translated/if.en_US.js
+++ b/spec/expected/compile/translated/if.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/if.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/if.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -149,4 +149,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/include.en_US.js b/spec/expected/compile/translated/include.en_US.js
index 9daebe9..c968eb4 100644
--- a/spec/expected/compile/translated/include.en_US.js
+++ b/spec/expected/compile/translated/include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/include.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -156,4 +156,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/include_foreach.en_US.js b/spec/expected/compile/translated/include_foreach.en_US.js
index 2f8856b..e20941f 100644
--- a/spec/expected/compile/translated/include_foreach.en_US.js
+++ b/spec/expected/compile/translated/include_foreach.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/include_foreach.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/include_foreach.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -126,4 +126,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/insert.en_US.js b/spec/expected/compile/translated/insert.en_US.js
index 8349a43..c5715cd 100644
--- a/spec/expected/compile/translated/insert.en_US.js
+++ b/spec/expected/compile/translated/insert.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/insert.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/insert.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/intercept.en_US.js b/spec/expected/compile/translated/intercept.en_US.js
index 099a811..4fd97e2 100644
--- a/spec/expected/compile/translated/intercept.en_US.js
+++ b/spec/expected/compile/translated/intercept.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/intercept.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/intercept.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/issue_64.en_US.js b/spec/expected/compile/translated/issue_64.en_US.js
index 4a97dcd..6195666 100644
--- a/spec/expected/compile/translated/issue_64.en_US.js
+++ b/spec/expected/compile/translated/issue_64.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/issue_64.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/issue_64.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/message.en_US.js b/spec/expected/compile/translated/message.en_US.js
index d961565..7cd5aef 100644
--- a/spec/expected/compile/translated/message.en_US.js
+++ b/spec/expected/compile/translated/message.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/message.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/message.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/params.en_US.js b/spec/expected/compile/translated/params.en_US.js
index 38421e2..1e0ac78 100644
--- a/spec/expected/compile/translated/params.en_US.js
+++ b/spec/expected/compile/translated/params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/params.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -135,4 +135,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/plural.en_US.js b/spec/expected/compile/translated/plural.en_US.js
index 807640a..dd5d455 100644
--- a/spec/expected/compile/translated/plural.en_US.js
+++ b/spec/expected/compile/translated/plural.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/plural.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/plural_english.en_US.js b/spec/expected/compile/translated/plural_english.en_US.js
index fcb9376..fbefd97 100644
--- a/spec/expected/compile/translated/plural_english.en_US.js
+++ b/spec/expected/compile/translated/plural_english.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/plural_english.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_english.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -146,4 +146,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/plural_escape.en_US.js b/spec/expected/compile/translated/plural_escape.en_US.js
index 6e0ba33..e89b70d 100644
--- a/spec/expected/compile/translated/plural_escape.en_US.js
+++ b/spec/expected/compile/translated/plural_escape.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/plural_escape.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_escape.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -136,4 +136,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/script.en_US.js b/spec/expected/compile/translated/script.en_US.js
index 2332a2c..f8053de 100644
--- a/spec/expected/compile/translated/script.en_US.js
+++ b/spec/expected/compile/translated/script.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/script.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/script.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -133,4 +133,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/set_bar.en_US.js b/spec/expected/compile/translated/set_bar.en_US.js
index cde4474..43a848a 100644
--- a/spec/expected/compile/translated/set_bar.en_US.js
+++ b/spec/expected/compile/translated/set_bar.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/set_bar.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_bar.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/set_params.en_US.js b/spec/expected/compile/translated/set_params.en_US.js
index 8434d45..7683110 100644
--- a/spec/expected/compile/translated/set_params.en_US.js
+++ b/spec/expected/compile/translated/set_params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/set_params.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -270,4 +270,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/set_params_inner.en_US.js b/spec/expected/compile/translated/set_params_inner.en_US.js
index fbce0a2..8b8e505 100644
--- a/spec/expected/compile/translated/set_params_inner.en_US.js
+++ b/spec/expected/compile/translated/set_params_inner.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/set_params_inner.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params_inner.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/short_tag.en_US.js b/spec/expected/compile/translated/short_tag.en_US.js
index a2a13a7..5d731a9 100644
--- a/spec/expected/compile/translated/short_tag.en_US.js
+++ b/spec/expected/compile/translated/short_tag.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/short_tag.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/short_tag.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/strict.en_US.js b/spec/expected/compile/translated/strict.en_US.js
index 5acb950..d930ed2 100644
--- a/spec/expected/compile/translated/strict.en_US.js
+++ b/spec/expected/compile/translated/strict.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/strict.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/strict.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -125,4 +125,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/text.en_US.js b/spec/expected/compile/translated/text.en_US.js
index 83ce370..56e4c5f 100644
--- a/spec/expected/compile/translated/text.en_US.js
+++ b/spec/expected/compile/translated/text.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/text.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/text.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -110,4 +110,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/useless_set.en_US.js b/spec/expected/compile/translated/useless_set.en_US.js
index b83e3c0..86e5586 100644
--- a/spec/expected/compile/translated/useless_set.en_US.js
+++ b/spec/expected/compile/translated/useless_set.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/useless_set.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -125,4 +125,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/useless_set_include.en_US.js b/spec/expected/compile/translated/useless_set_include.en_US.js
index 1758fd9..d48d23b 100644
--- a/spec/expected/compile/translated/useless_set_include.en_US.js
+++ b/spec/expected/compile/translated/useless_set_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/useless_set_include.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -109,4 +109,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/useless_set_select.en_US.js b/spec/expected/compile/translated/useless_set_select.en_US.js
index eede28e..15b633c 100644
--- a/spec/expected/compile/translated/useless_set_select.en_US.js
+++ b/spec/expected/compile/translated/useless_set_select.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/useless_set_select.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_select.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -160,4 +160,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/value.en_US.js b/spec/expected/compile/translated/value.en_US.js
index 47e7c42..8610b51 100644
--- a/spec/expected/compile/translated/value.en_US.js
+++ b/spec/expected/compile/translated/value.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/value.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/value.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -171,4 +171,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/var.en_US.js b/spec/expected/compile/translated/var.en_US.js
index d5066ed..ddaab3d 100644
--- a/spec/expected/compile/translated/var.en_US.js
+++ b/spec/expected/compile/translated/var.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/var.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/var.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -134,4 +134,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file
diff --git a/spec/expected/compile/translated/xss.en_US.js b/spec/expected/compile/translated/xss.en_US.js
index f376506..7640499 100644
--- a/spec/expected/compile/translated/xss.en_US.js
+++ b/spec/expected/compile/translated/xss.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=Function('return this')();if(!x.fest)x.fest={};x.fest['spec/templates/xss.en_US']=function(__fest_context) {
+;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/xss.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
@@ -116,4 +116,4 @@
     } else {
         return __fest_buf;
     }
-}})();
\ No newline at end of file
+};})();
\ No newline at end of file

From 8e266da2917c83cc0c510bb28f37d10954e5ac6b Mon Sep 17 00:00:00 2001
From: Alexander Guinness <monolithed@gmail.com>
Date: Wed, 23 Oct 2013 14:15:21 +0400
Subject: [PATCH 3/4] revert global object

---
 lib/compile_tmpl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/compile_tmpl.js b/lib/compile_tmpl.js
index bebdec9..1a03bdb 100644
--- a/lib/compile_tmpl.js
+++ b/lib/compile_tmpl.js
@@ -1,5 +1,5 @@
 function compile_tmpl(file, source, wrapper) {
-	var fest = "var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['##file##']=##source##;";
+	var fest = "var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['##file##']=##source##;";
 
 	var wrappers = {
 		fest:     ";(function(){" + fest + "})();",

From 31803e4b6e87ca64a5b2f83dca04346fc0831ffd Mon Sep 17 00:00:00 2001
From: Alexander Guinness <monolithed@gmail.com>
Date: Wed, 23 Oct 2013 14:33:11 +0400
Subject: [PATCH 4/4] rebuild

---
 README.md                                                    | 5 +++--
 spec/expected/build/initial/attribute.js                     | 2 +-
 spec/expected/build/initial/attribute_expression.js          | 2 +-
 spec/expected/build/initial/block_for_include.js             | 2 +-
 spec/expected/build/initial/block_unsuspected_recursion.js   | 2 +-
 spec/expected/build/initial/block_with_include.js            | 2 +-
 spec/expected/build/initial/block_with_params.js             | 2 +-
 spec/expected/build/initial/blocks.js                        | 2 +-
 spec/expected/build/initial/call.js                          | 2 +-
 spec/expected/build/initial/cdata.js                         | 2 +-
 spec/expected/build/initial/choose.js                        | 2 +-
 spec/expected/build/initial/comment.js                       | 2 +-
 spec/expected/build/initial/doctype.js                       | 2 +-
 spec/expected/build/initial/each.js                          | 2 +-
 spec/expected/build/initial/element.js                       | 2 +-
 spec/expected/build/initial/for.js                           | 2 +-
 spec/expected/build/initial/if.js                            | 2 +-
 spec/expected/build/initial/include.js                       | 2 +-
 spec/expected/build/initial/include_foreach.js               | 2 +-
 spec/expected/build/initial/insert.js                        | 2 +-
 spec/expected/build/initial/intercept.js                     | 2 +-
 spec/expected/build/initial/issue_64.js                      | 2 +-
 spec/expected/build/initial/message.js                       | 2 +-
 spec/expected/build/initial/params.js                        | 2 +-
 spec/expected/build/initial/plural.js                        | 2 +-
 spec/expected/build/initial/plural_english.js                | 2 +-
 spec/expected/build/initial/plural_escape.js                 | 2 +-
 spec/expected/build/initial/script.js                        | 2 +-
 spec/expected/build/initial/set_bar.js                       | 2 +-
 spec/expected/build/initial/set_params.js                    | 2 +-
 spec/expected/build/initial/set_params_inner.js              | 2 +-
 spec/expected/build/initial/short_tag.js                     | 2 +-
 spec/expected/build/initial/strict.js                        | 2 +-
 spec/expected/build/initial/text.js                          | 2 +-
 spec/expected/build/initial/useless_set.js                   | 2 +-
 spec/expected/build/initial/useless_set_include.js           | 2 +-
 spec/expected/build/initial/useless_set_select.js            | 2 +-
 spec/expected/build/initial/value.js                         | 2 +-
 spec/expected/build/initial/var.js                           | 2 +-
 spec/expected/build/initial/xss.js                           | 2 +-
 spec/expected/build/translated/attribute.en_US.js            | 2 +-
 spec/expected/build/translated/attribute_expression.en_US.js | 2 +-
 spec/expected/build/translated/block_for_include.en_US.js    | 2 +-
 .../build/translated/block_unsuspected_recursion.en_US.js    | 2 +-
 spec/expected/build/translated/block_with_include.en_US.js   | 2 +-
 spec/expected/build/translated/block_with_params.en_US.js    | 2 +-
 spec/expected/build/translated/blocks.en_US.js               | 2 +-
 spec/expected/build/translated/call.en_US.js                 | 2 +-
 spec/expected/build/translated/cdata.en_US.js                | 2 +-
 spec/expected/build/translated/choose.en_US.js               | 2 +-
 spec/expected/build/translated/comment.en_US.js              | 2 +-
 spec/expected/build/translated/doctype.en_US.js              | 2 +-
 spec/expected/build/translated/each.en_US.js                 | 2 +-
 spec/expected/build/translated/element.en_US.js              | 2 +-
 spec/expected/build/translated/for.en_US.js                  | 2 +-
 spec/expected/build/translated/if.en_US.js                   | 2 +-
 spec/expected/build/translated/include.en_US.js              | 2 +-
 spec/expected/build/translated/include_foreach.en_US.js      | 2 +-
 spec/expected/build/translated/insert.en_US.js               | 2 +-
 spec/expected/build/translated/intercept.en_US.js            | 2 +-
 spec/expected/build/translated/issue_64.en_US.js             | 2 +-
 spec/expected/build/translated/message.en_US.js              | 2 +-
 spec/expected/build/translated/params.en_US.js               | 2 +-
 spec/expected/build/translated/plural.en_US.js               | 2 +-
 spec/expected/build/translated/plural_english.en_US.js       | 2 +-
 spec/expected/build/translated/plural_escape.en_US.js        | 2 +-
 spec/expected/build/translated/script.en_US.js               | 2 +-
 spec/expected/build/translated/set_bar.en_US.js              | 2 +-
 spec/expected/build/translated/set_params.en_US.js           | 2 +-
 spec/expected/build/translated/set_params_inner.en_US.js     | 2 +-
 spec/expected/build/translated/short_tag.en_US.js            | 2 +-
 spec/expected/build/translated/strict.en_US.js               | 2 +-
 spec/expected/build/translated/text.en_US.js                 | 2 +-
 spec/expected/build/translated/useless_set.en_US.js          | 2 +-
 spec/expected/build/translated/useless_set_include.en_US.js  | 2 +-
 spec/expected/build/translated/useless_set_select.en_US.js   | 2 +-
 spec/expected/build/translated/value.en_US.js                | 2 +-
 spec/expected/build/translated/var.en_US.js                  | 2 +-
 spec/expected/build/translated/xss.en_US.js                  | 2 +-
 spec/expected/compile/initial/attribute.js                   | 2 +-
 spec/expected/compile/initial/attribute_expression.js        | 2 +-
 spec/expected/compile/initial/block_for_include.js           | 2 +-
 spec/expected/compile/initial/block_unsuspected_recursion.js | 2 +-
 spec/expected/compile/initial/block_with_include.js          | 2 +-
 spec/expected/compile/initial/block_with_params.js           | 2 +-
 spec/expected/compile/initial/blocks.js                      | 2 +-
 spec/expected/compile/initial/call.js                        | 2 +-
 spec/expected/compile/initial/cdata.js                       | 2 +-
 spec/expected/compile/initial/choose.js                      | 2 +-
 spec/expected/compile/initial/comment.js                     | 2 +-
 spec/expected/compile/initial/doctype.js                     | 2 +-
 spec/expected/compile/initial/each.js                        | 2 +-
 spec/expected/compile/initial/element.js                     | 2 +-
 spec/expected/compile/initial/for.js                         | 2 +-
 spec/expected/compile/initial/if.js                          | 2 +-
 spec/expected/compile/initial/include.js                     | 2 +-
 spec/expected/compile/initial/include_foreach.js             | 2 +-
 spec/expected/compile/initial/insert.js                      | 2 +-
 spec/expected/compile/initial/intercept.js                   | 2 +-
 spec/expected/compile/initial/issue_64.js                    | 2 +-
 spec/expected/compile/initial/message.js                     | 2 +-
 spec/expected/compile/initial/params.js                      | 2 +-
 spec/expected/compile/initial/plural.js                      | 2 +-
 spec/expected/compile/initial/plural_english.js              | 2 +-
 spec/expected/compile/initial/plural_escape.js               | 2 +-
 spec/expected/compile/initial/script.js                      | 2 +-
 spec/expected/compile/initial/set_bar.js                     | 2 +-
 spec/expected/compile/initial/set_params.js                  | 2 +-
 spec/expected/compile/initial/set_params_inner.js            | 2 +-
 spec/expected/compile/initial/short_tag.js                   | 2 +-
 spec/expected/compile/initial/strict.js                      | 2 +-
 spec/expected/compile/initial/text.js                        | 2 +-
 spec/expected/compile/initial/useless_set.js                 | 2 +-
 spec/expected/compile/initial/useless_set_include.js         | 2 +-
 spec/expected/compile/initial/useless_set_select.js          | 2 +-
 spec/expected/compile/initial/value.js                       | 2 +-
 spec/expected/compile/initial/var.js                         | 2 +-
 spec/expected/compile/initial/xss.js                         | 2 +-
 spec/expected/compile/translated/attribute.en_US.js          | 2 +-
 .../compile/translated/attribute_expression.en_US.js         | 2 +-
 spec/expected/compile/translated/block_for_include.en_US.js  | 2 +-
 .../compile/translated/block_unsuspected_recursion.en_US.js  | 2 +-
 spec/expected/compile/translated/block_with_include.en_US.js | 2 +-
 spec/expected/compile/translated/block_with_params.en_US.js  | 2 +-
 spec/expected/compile/translated/blocks.en_US.js             | 2 +-
 spec/expected/compile/translated/call.en_US.js               | 2 +-
 spec/expected/compile/translated/cdata.en_US.js              | 2 +-
 spec/expected/compile/translated/choose.en_US.js             | 2 +-
 spec/expected/compile/translated/comment.en_US.js            | 2 +-
 spec/expected/compile/translated/doctype.en_US.js            | 2 +-
 spec/expected/compile/translated/each.en_US.js               | 2 +-
 spec/expected/compile/translated/element.en_US.js            | 2 +-
 spec/expected/compile/translated/for.en_US.js                | 2 +-
 spec/expected/compile/translated/if.en_US.js                 | 2 +-
 spec/expected/compile/translated/include.en_US.js            | 2 +-
 spec/expected/compile/translated/include_foreach.en_US.js    | 2 +-
 spec/expected/compile/translated/insert.en_US.js             | 2 +-
 spec/expected/compile/translated/intercept.en_US.js          | 2 +-
 spec/expected/compile/translated/issue_64.en_US.js           | 2 +-
 spec/expected/compile/translated/message.en_US.js            | 2 +-
 spec/expected/compile/translated/params.en_US.js             | 2 +-
 spec/expected/compile/translated/plural.en_US.js             | 2 +-
 spec/expected/compile/translated/plural_english.en_US.js     | 2 +-
 spec/expected/compile/translated/plural_escape.en_US.js      | 2 +-
 spec/expected/compile/translated/script.en_US.js             | 2 +-
 spec/expected/compile/translated/set_bar.en_US.js            | 2 +-
 spec/expected/compile/translated/set_params.en_US.js         | 2 +-
 spec/expected/compile/translated/set_params_inner.en_US.js   | 2 +-
 spec/expected/compile/translated/short_tag.en_US.js          | 2 +-
 spec/expected/compile/translated/strict.en_US.js             | 2 +-
 spec/expected/compile/translated/text.en_US.js               | 2 +-
 spec/expected/compile/translated/useless_set.en_US.js        | 2 +-
 .../expected/compile/translated/useless_set_include.en_US.js | 2 +-
 spec/expected/compile/translated/useless_set_select.en_US.js | 2 +-
 spec/expected/compile/translated/value.en_US.js              | 2 +-
 spec/expected/compile/translated/var.en_US.js                | 2 +-
 spec/expected/compile/translated/xss.en_US.js                | 2 +-
 157 files changed, 159 insertions(+), 158 deletions(-)

diff --git a/README.md b/README.md
index 863993e..f75f907 100644
--- a/README.md
+++ b/README.md
@@ -592,6 +592,7 @@ Grunt используется для валидации JS (тестов) и з
 Если необходимо пересобрать шаблоны spec/expected, то выполните:
 
 ```
-$ ./bin/fest-build --dir=spec/templates --exclude=*error* --compile.beautify=true --out=spec/expected/initial
-$ ./bin/fest-build --dir=spec/templates --exclude=*error* --compile.beautify=true --out=spec/expected/translated --translate=spec/templates/en_US.po
+grunt
+rm -rf spec/expected/initial/ spec/expected/translate
+cp -Rf spec/tmp/* spec/expected/
 ```
diff --git a/spec/expected/build/initial/attribute.js b/spec/expected/build/initial/attribute.js
index a4611b2..7d0468b 100644
--- a/spec/expected/build/initial/attribute.js
+++ b/spec/expected/build/initial/attribute.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['attribute']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['attribute']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/attribute_expression.js b/spec/expected/build/initial/attribute_expression.js
index a1e47a4..af1da41 100644
--- a/spec/expected/build/initial/attribute_expression.js
+++ b/spec/expected/build/initial/attribute_expression.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['attribute_expression']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['attribute_expression']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/block_for_include.js b/spec/expected/build/initial/block_for_include.js
index 88e4a9c..1c7cf47 100644
--- a/spec/expected/build/initial/block_for_include.js
+++ b/spec/expected/build/initial/block_for_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_for_include']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['block_for_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/block_unsuspected_recursion.js b/spec/expected/build/initial/block_unsuspected_recursion.js
index 1824f24..c90b74d 100644
--- a/spec/expected/build/initial/block_unsuspected_recursion.js
+++ b/spec/expected/build/initial/block_unsuspected_recursion.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_unsuspected_recursion']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['block_unsuspected_recursion']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/block_with_include.js b/spec/expected/build/initial/block_with_include.js
index 0c5b46b..935380b 100644
--- a/spec/expected/build/initial/block_with_include.js
+++ b/spec/expected/build/initial/block_with_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_with_include']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['block_with_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/block_with_params.js b/spec/expected/build/initial/block_with_params.js
index 9cbbff1..e9edd69 100644
--- a/spec/expected/build/initial/block_with_params.js
+++ b/spec/expected/build/initial/block_with_params.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_with_params']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['block_with_params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/blocks.js b/spec/expected/build/initial/blocks.js
index 8215e31..a48b16a 100644
--- a/spec/expected/build/initial/blocks.js
+++ b/spec/expected/build/initial/blocks.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['blocks']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['blocks']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/call.js b/spec/expected/build/initial/call.js
index 309fb0f..fca58ee 100644
--- a/spec/expected/build/initial/call.js
+++ b/spec/expected/build/initial/call.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['call']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['call']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/cdata.js b/spec/expected/build/initial/cdata.js
index 270e7e4..77d48c1 100644
--- a/spec/expected/build/initial/cdata.js
+++ b/spec/expected/build/initial/cdata.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['cdata']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['cdata']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/choose.js b/spec/expected/build/initial/choose.js
index 2aabe94..7577dce 100644
--- a/spec/expected/build/initial/choose.js
+++ b/spec/expected/build/initial/choose.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['choose']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['choose']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/comment.js b/spec/expected/build/initial/comment.js
index db8a3b3..a2725e3 100644
--- a/spec/expected/build/initial/comment.js
+++ b/spec/expected/build/initial/comment.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['comment']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['comment']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/doctype.js b/spec/expected/build/initial/doctype.js
index b51475e..abd6140 100644
--- a/spec/expected/build/initial/doctype.js
+++ b/spec/expected/build/initial/doctype.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['doctype']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['doctype']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/each.js b/spec/expected/build/initial/each.js
index e1e3dc7..8cb6cfa 100644
--- a/spec/expected/build/initial/each.js
+++ b/spec/expected/build/initial/each.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['each']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['each']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/element.js b/spec/expected/build/initial/element.js
index ec828bc..8ea6527 100644
--- a/spec/expected/build/initial/element.js
+++ b/spec/expected/build/initial/element.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['element']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['element']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/for.js b/spec/expected/build/initial/for.js
index 9889e5c..6e97534 100644
--- a/spec/expected/build/initial/for.js
+++ b/spec/expected/build/initial/for.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['for']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['for']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/if.js b/spec/expected/build/initial/if.js
index ee3a31a..84ab672 100644
--- a/spec/expected/build/initial/if.js
+++ b/spec/expected/build/initial/if.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['if']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['if']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/include.js b/spec/expected/build/initial/include.js
index fafaa32..e308224 100644
--- a/spec/expected/build/initial/include.js
+++ b/spec/expected/build/initial/include.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['include']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/include_foreach.js b/spec/expected/build/initial/include_foreach.js
index fdeb34e..45a4682 100644
--- a/spec/expected/build/initial/include_foreach.js
+++ b/spec/expected/build/initial/include_foreach.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['include_foreach']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['include_foreach']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/insert.js b/spec/expected/build/initial/insert.js
index 83ae206..f6adf84 100644
--- a/spec/expected/build/initial/insert.js
+++ b/spec/expected/build/initial/insert.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['insert']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['insert']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/intercept.js b/spec/expected/build/initial/intercept.js
index c0dd915..c8b390b 100644
--- a/spec/expected/build/initial/intercept.js
+++ b/spec/expected/build/initial/intercept.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['intercept']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['intercept']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/issue_64.js b/spec/expected/build/initial/issue_64.js
index 0727bf8..031cb3d 100644
--- a/spec/expected/build/initial/issue_64.js
+++ b/spec/expected/build/initial/issue_64.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['issue_64']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['issue_64']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/message.js b/spec/expected/build/initial/message.js
index 5039c37..660815a 100644
--- a/spec/expected/build/initial/message.js
+++ b/spec/expected/build/initial/message.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['message']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['message']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/params.js b/spec/expected/build/initial/params.js
index 0f712a3..584bcfe 100644
--- a/spec/expected/build/initial/params.js
+++ b/spec/expected/build/initial/params.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['params']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/plural.js b/spec/expected/build/initial/plural.js
index f78dab8..2e42bd1 100644
--- a/spec/expected/build/initial/plural.js
+++ b/spec/expected/build/initial/plural.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['plural']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/plural_english.js b/spec/expected/build/initial/plural_english.js
index 5278565..2bb1295 100644
--- a/spec/expected/build/initial/plural_english.js
+++ b/spec/expected/build/initial/plural_english.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural_english']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['plural_english']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/plural_escape.js b/spec/expected/build/initial/plural_escape.js
index a09f51d..89b98d2 100644
--- a/spec/expected/build/initial/plural_escape.js
+++ b/spec/expected/build/initial/plural_escape.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural_escape']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['plural_escape']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/script.js b/spec/expected/build/initial/script.js
index a97649e..1e212fd 100644
--- a/spec/expected/build/initial/script.js
+++ b/spec/expected/build/initial/script.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['script']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['script']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/set_bar.js b/spec/expected/build/initial/set_bar.js
index 2c31f1e..d4ecf0b 100644
--- a/spec/expected/build/initial/set_bar.js
+++ b/spec/expected/build/initial/set_bar.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_bar']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['set_bar']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/set_params.js b/spec/expected/build/initial/set_params.js
index 5c381a6..7766422 100644
--- a/spec/expected/build/initial/set_params.js
+++ b/spec/expected/build/initial/set_params.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_params']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['set_params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/set_params_inner.js b/spec/expected/build/initial/set_params_inner.js
index 7a34959..3ff2cb2 100644
--- a/spec/expected/build/initial/set_params_inner.js
+++ b/spec/expected/build/initial/set_params_inner.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_params_inner']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['set_params_inner']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/short_tag.js b/spec/expected/build/initial/short_tag.js
index 8f0ca80..38f999d 100644
--- a/spec/expected/build/initial/short_tag.js
+++ b/spec/expected/build/initial/short_tag.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['short_tag']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['short_tag']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/strict.js b/spec/expected/build/initial/strict.js
index f1214fb..62c2837 100644
--- a/spec/expected/build/initial/strict.js
+++ b/spec/expected/build/initial/strict.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['strict']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['strict']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/text.js b/spec/expected/build/initial/text.js
index 5c7a223..85ab31d 100644
--- a/spec/expected/build/initial/text.js
+++ b/spec/expected/build/initial/text.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['text']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['text']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/useless_set.js b/spec/expected/build/initial/useless_set.js
index 1f8a1ac..8345d49 100644
--- a/spec/expected/build/initial/useless_set.js
+++ b/spec/expected/build/initial/useless_set.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['useless_set']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/useless_set_include.js b/spec/expected/build/initial/useless_set_include.js
index db7e0a4..a58a987 100644
--- a/spec/expected/build/initial/useless_set_include.js
+++ b/spec/expected/build/initial/useless_set_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set_include']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['useless_set_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/useless_set_select.js b/spec/expected/build/initial/useless_set_select.js
index 608368a..deec31d 100644
--- a/spec/expected/build/initial/useless_set_select.js
+++ b/spec/expected/build/initial/useless_set_select.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set_select']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['useless_set_select']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/value.js b/spec/expected/build/initial/value.js
index 8e7b593..0924706 100644
--- a/spec/expected/build/initial/value.js
+++ b/spec/expected/build/initial/value.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['value']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['value']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/var.js b/spec/expected/build/initial/var.js
index 7950937..c84445a 100644
--- a/spec/expected/build/initial/var.js
+++ b/spec/expected/build/initial/var.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['var']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['var']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/initial/xss.js b/spec/expected/build/initial/xss.js
index 1550830..64bef13 100644
--- a/spec/expected/build/initial/xss.js
+++ b/spec/expected/build/initial/xss.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['xss']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['xss']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/attribute.en_US.js b/spec/expected/build/translated/attribute.en_US.js
index fd7f3d7..2fbfdc8 100644
--- a/spec/expected/build/translated/attribute.en_US.js
+++ b/spec/expected/build/translated/attribute.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['attribute.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['attribute.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/attribute_expression.en_US.js b/spec/expected/build/translated/attribute_expression.en_US.js
index e7f325e..2010897 100644
--- a/spec/expected/build/translated/attribute_expression.en_US.js
+++ b/spec/expected/build/translated/attribute_expression.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['attribute_expression.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['attribute_expression.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/block_for_include.en_US.js b/spec/expected/build/translated/block_for_include.en_US.js
index f7aa4e0..7da9f8e 100644
--- a/spec/expected/build/translated/block_for_include.en_US.js
+++ b/spec/expected/build/translated/block_for_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_for_include.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['block_for_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/block_unsuspected_recursion.en_US.js b/spec/expected/build/translated/block_unsuspected_recursion.en_US.js
index 624e91d..1b2cefe 100644
--- a/spec/expected/build/translated/block_unsuspected_recursion.en_US.js
+++ b/spec/expected/build/translated/block_unsuspected_recursion.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_unsuspected_recursion.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['block_unsuspected_recursion.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/block_with_include.en_US.js b/spec/expected/build/translated/block_with_include.en_US.js
index 4fb760c..61e732b 100644
--- a/spec/expected/build/translated/block_with_include.en_US.js
+++ b/spec/expected/build/translated/block_with_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_with_include.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['block_with_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/block_with_params.en_US.js b/spec/expected/build/translated/block_with_params.en_US.js
index e01bb68..0ab9296 100644
--- a/spec/expected/build/translated/block_with_params.en_US.js
+++ b/spec/expected/build/translated/block_with_params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['block_with_params.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['block_with_params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/blocks.en_US.js b/spec/expected/build/translated/blocks.en_US.js
index d8aec9b..27aa0a3 100644
--- a/spec/expected/build/translated/blocks.en_US.js
+++ b/spec/expected/build/translated/blocks.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['blocks.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['blocks.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/call.en_US.js b/spec/expected/build/translated/call.en_US.js
index 05089c1..7109cba 100644
--- a/spec/expected/build/translated/call.en_US.js
+++ b/spec/expected/build/translated/call.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['call.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['call.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/cdata.en_US.js b/spec/expected/build/translated/cdata.en_US.js
index 5a1c84f..5749a77 100644
--- a/spec/expected/build/translated/cdata.en_US.js
+++ b/spec/expected/build/translated/cdata.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['cdata.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['cdata.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/choose.en_US.js b/spec/expected/build/translated/choose.en_US.js
index fb194b8..d4c4dae 100644
--- a/spec/expected/build/translated/choose.en_US.js
+++ b/spec/expected/build/translated/choose.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['choose.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['choose.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/comment.en_US.js b/spec/expected/build/translated/comment.en_US.js
index 382a71f..e8b79b1 100644
--- a/spec/expected/build/translated/comment.en_US.js
+++ b/spec/expected/build/translated/comment.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['comment.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['comment.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/doctype.en_US.js b/spec/expected/build/translated/doctype.en_US.js
index 8cffd2b..09841d3 100644
--- a/spec/expected/build/translated/doctype.en_US.js
+++ b/spec/expected/build/translated/doctype.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['doctype.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['doctype.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/each.en_US.js b/spec/expected/build/translated/each.en_US.js
index 53d316f..e9d2c46 100644
--- a/spec/expected/build/translated/each.en_US.js
+++ b/spec/expected/build/translated/each.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['each.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['each.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/element.en_US.js b/spec/expected/build/translated/element.en_US.js
index 778a429..63f305d 100644
--- a/spec/expected/build/translated/element.en_US.js
+++ b/spec/expected/build/translated/element.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['element.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['element.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/for.en_US.js b/spec/expected/build/translated/for.en_US.js
index f14d5b3..232b31c 100644
--- a/spec/expected/build/translated/for.en_US.js
+++ b/spec/expected/build/translated/for.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['for.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['for.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/if.en_US.js b/spec/expected/build/translated/if.en_US.js
index 04facc7..c3f3cd5 100644
--- a/spec/expected/build/translated/if.en_US.js
+++ b/spec/expected/build/translated/if.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['if.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['if.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/include.en_US.js b/spec/expected/build/translated/include.en_US.js
index 8ccf110..e7a5dda 100644
--- a/spec/expected/build/translated/include.en_US.js
+++ b/spec/expected/build/translated/include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['include.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/include_foreach.en_US.js b/spec/expected/build/translated/include_foreach.en_US.js
index 85da317..3315ca5 100644
--- a/spec/expected/build/translated/include_foreach.en_US.js
+++ b/spec/expected/build/translated/include_foreach.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['include_foreach.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['include_foreach.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/insert.en_US.js b/spec/expected/build/translated/insert.en_US.js
index 42edf98..33eeb2a 100644
--- a/spec/expected/build/translated/insert.en_US.js
+++ b/spec/expected/build/translated/insert.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['insert.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['insert.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/intercept.en_US.js b/spec/expected/build/translated/intercept.en_US.js
index 7aa6553..d2e7e9b 100644
--- a/spec/expected/build/translated/intercept.en_US.js
+++ b/spec/expected/build/translated/intercept.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['intercept.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['intercept.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/issue_64.en_US.js b/spec/expected/build/translated/issue_64.en_US.js
index 09c7aaf..a0a0ef9 100644
--- a/spec/expected/build/translated/issue_64.en_US.js
+++ b/spec/expected/build/translated/issue_64.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['issue_64.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['issue_64.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/message.en_US.js b/spec/expected/build/translated/message.en_US.js
index 178e25f..009b0ce 100644
--- a/spec/expected/build/translated/message.en_US.js
+++ b/spec/expected/build/translated/message.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['message.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['message.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/params.en_US.js b/spec/expected/build/translated/params.en_US.js
index 6504d39..b47518b 100644
--- a/spec/expected/build/translated/params.en_US.js
+++ b/spec/expected/build/translated/params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['params.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/plural.en_US.js b/spec/expected/build/translated/plural.en_US.js
index 04375f3..8f072de 100644
--- a/spec/expected/build/translated/plural.en_US.js
+++ b/spec/expected/build/translated/plural.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['plural.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/plural_english.en_US.js b/spec/expected/build/translated/plural_english.en_US.js
index 0e74062..819b9fb 100644
--- a/spec/expected/build/translated/plural_english.en_US.js
+++ b/spec/expected/build/translated/plural_english.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural_english.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['plural_english.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/plural_escape.en_US.js b/spec/expected/build/translated/plural_escape.en_US.js
index 3e5a247..4e602fb 100644
--- a/spec/expected/build/translated/plural_escape.en_US.js
+++ b/spec/expected/build/translated/plural_escape.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['plural_escape.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['plural_escape.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/script.en_US.js b/spec/expected/build/translated/script.en_US.js
index 2c1f777..374020d 100644
--- a/spec/expected/build/translated/script.en_US.js
+++ b/spec/expected/build/translated/script.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['script.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['script.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/set_bar.en_US.js b/spec/expected/build/translated/set_bar.en_US.js
index 67a68cc..03597af 100644
--- a/spec/expected/build/translated/set_bar.en_US.js
+++ b/spec/expected/build/translated/set_bar.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_bar.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['set_bar.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/set_params.en_US.js b/spec/expected/build/translated/set_params.en_US.js
index d5d8370..8342f0a 100644
--- a/spec/expected/build/translated/set_params.en_US.js
+++ b/spec/expected/build/translated/set_params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_params.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['set_params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/set_params_inner.en_US.js b/spec/expected/build/translated/set_params_inner.en_US.js
index fbd96c0..f8c04ea 100644
--- a/spec/expected/build/translated/set_params_inner.en_US.js
+++ b/spec/expected/build/translated/set_params_inner.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['set_params_inner.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['set_params_inner.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/short_tag.en_US.js b/spec/expected/build/translated/short_tag.en_US.js
index 7783eae..628bb43 100644
--- a/spec/expected/build/translated/short_tag.en_US.js
+++ b/spec/expected/build/translated/short_tag.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['short_tag.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['short_tag.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/strict.en_US.js b/spec/expected/build/translated/strict.en_US.js
index aa0d06e..c1e0626 100644
--- a/spec/expected/build/translated/strict.en_US.js
+++ b/spec/expected/build/translated/strict.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['strict.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['strict.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/text.en_US.js b/spec/expected/build/translated/text.en_US.js
index e6bee52..3f2d844 100644
--- a/spec/expected/build/translated/text.en_US.js
+++ b/spec/expected/build/translated/text.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['text.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['text.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/useless_set.en_US.js b/spec/expected/build/translated/useless_set.en_US.js
index defa2d9..45f50d8 100644
--- a/spec/expected/build/translated/useless_set.en_US.js
+++ b/spec/expected/build/translated/useless_set.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['useless_set.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/useless_set_include.en_US.js b/spec/expected/build/translated/useless_set_include.en_US.js
index 8ffc0cb..26a0d11 100644
--- a/spec/expected/build/translated/useless_set_include.en_US.js
+++ b/spec/expected/build/translated/useless_set_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set_include.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['useless_set_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/useless_set_select.en_US.js b/spec/expected/build/translated/useless_set_select.en_US.js
index 453dc7a..221b3ce 100644
--- a/spec/expected/build/translated/useless_set_select.en_US.js
+++ b/spec/expected/build/translated/useless_set_select.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['useless_set_select.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['useless_set_select.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/value.en_US.js b/spec/expected/build/translated/value.en_US.js
index a024b66..8414aea 100644
--- a/spec/expected/build/translated/value.en_US.js
+++ b/spec/expected/build/translated/value.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['value.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['value.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/var.en_US.js b/spec/expected/build/translated/var.en_US.js
index 27e0fe7..bf3c702 100644
--- a/spec/expected/build/translated/var.en_US.js
+++ b/spec/expected/build/translated/var.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['var.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['var.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/build/translated/xss.en_US.js b/spec/expected/build/translated/xss.en_US.js
index 5df6741..802980c 100644
--- a/spec/expected/build/translated/xss.en_US.js
+++ b/spec/expected/build/translated/xss.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['xss.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['xss.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/attribute.js b/spec/expected/compile/initial/attribute.js
index 03fced0..7c324f3 100644
--- a/spec/expected/compile/initial/attribute.js
+++ b/spec/expected/compile/initial/attribute.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/attribute_expression.js b/spec/expected/compile/initial/attribute_expression.js
index f23d11d..8571eec 100644
--- a/spec/expected/compile/initial/attribute_expression.js
+++ b/spec/expected/compile/initial/attribute_expression.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute_expression']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute_expression']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/block_for_include.js b/spec/expected/compile/initial/block_for_include.js
index b801ae7..13acdce 100644
--- a/spec/expected/compile/initial/block_for_include.js
+++ b/spec/expected/compile/initial/block_for_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_for_include']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_for_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/block_unsuspected_recursion.js b/spec/expected/compile/initial/block_unsuspected_recursion.js
index 955d941..29fc873 100644
--- a/spec/expected/compile/initial/block_unsuspected_recursion.js
+++ b/spec/expected/compile/initial/block_unsuspected_recursion.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_unsuspected_recursion']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_unsuspected_recursion']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/block_with_include.js b/spec/expected/compile/initial/block_with_include.js
index 6587328..74a9493 100644
--- a/spec/expected/compile/initial/block_with_include.js
+++ b/spec/expected/compile/initial/block_with_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_include']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/block_with_params.js b/spec/expected/compile/initial/block_with_params.js
index fe2be61..7dc89f1 100644
--- a/spec/expected/compile/initial/block_with_params.js
+++ b/spec/expected/compile/initial/block_with_params.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_params']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/blocks.js b/spec/expected/compile/initial/blocks.js
index a7576e9..c61446d 100644
--- a/spec/expected/compile/initial/blocks.js
+++ b/spec/expected/compile/initial/blocks.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/blocks']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/blocks']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/call.js b/spec/expected/compile/initial/call.js
index b6c1e85..4320db0 100644
--- a/spec/expected/compile/initial/call.js
+++ b/spec/expected/compile/initial/call.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/call']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/call']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/cdata.js b/spec/expected/compile/initial/cdata.js
index c4e46c6..32c79d8 100644
--- a/spec/expected/compile/initial/cdata.js
+++ b/spec/expected/compile/initial/cdata.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/cdata']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/cdata']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/choose.js b/spec/expected/compile/initial/choose.js
index 415d4c4..67352ed 100644
--- a/spec/expected/compile/initial/choose.js
+++ b/spec/expected/compile/initial/choose.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/choose']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/choose']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/comment.js b/spec/expected/compile/initial/comment.js
index 6e38932..3f4b58b 100644
--- a/spec/expected/compile/initial/comment.js
+++ b/spec/expected/compile/initial/comment.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/comment']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/comment']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/doctype.js b/spec/expected/compile/initial/doctype.js
index f80d6f2..a6416da 100644
--- a/spec/expected/compile/initial/doctype.js
+++ b/spec/expected/compile/initial/doctype.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/doctype']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/doctype']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/each.js b/spec/expected/compile/initial/each.js
index a2aa5aa..3872e11 100644
--- a/spec/expected/compile/initial/each.js
+++ b/spec/expected/compile/initial/each.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/each']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/each']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/element.js b/spec/expected/compile/initial/element.js
index 183ff9f..b3abde2 100644
--- a/spec/expected/compile/initial/element.js
+++ b/spec/expected/compile/initial/element.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/element']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/element']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/for.js b/spec/expected/compile/initial/for.js
index 145c199..bb6d2c1 100644
--- a/spec/expected/compile/initial/for.js
+++ b/spec/expected/compile/initial/for.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/for']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/for']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/if.js b/spec/expected/compile/initial/if.js
index 258eb5a..0c74680 100644
--- a/spec/expected/compile/initial/if.js
+++ b/spec/expected/compile/initial/if.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/if']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/if']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/include.js b/spec/expected/compile/initial/include.js
index fc39ecd..8cae105 100644
--- a/spec/expected/compile/initial/include.js
+++ b/spec/expected/compile/initial/include.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/include']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/include_foreach.js b/spec/expected/compile/initial/include_foreach.js
index fd7b334..8137c83 100644
--- a/spec/expected/compile/initial/include_foreach.js
+++ b/spec/expected/compile/initial/include_foreach.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/include_foreach']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/include_foreach']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/insert.js b/spec/expected/compile/initial/insert.js
index 1887966..6c224ac 100644
--- a/spec/expected/compile/initial/insert.js
+++ b/spec/expected/compile/initial/insert.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/insert']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/insert']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/intercept.js b/spec/expected/compile/initial/intercept.js
index 3b06efb..178da99 100644
--- a/spec/expected/compile/initial/intercept.js
+++ b/spec/expected/compile/initial/intercept.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/intercept']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/intercept']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/issue_64.js b/spec/expected/compile/initial/issue_64.js
index 5e4394f..f43be34 100644
--- a/spec/expected/compile/initial/issue_64.js
+++ b/spec/expected/compile/initial/issue_64.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/issue_64']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/issue_64']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/message.js b/spec/expected/compile/initial/message.js
index cfd5d97..dd029ae 100644
--- a/spec/expected/compile/initial/message.js
+++ b/spec/expected/compile/initial/message.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/message']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/message']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/params.js b/spec/expected/compile/initial/params.js
index 591da04..8211326 100644
--- a/spec/expected/compile/initial/params.js
+++ b/spec/expected/compile/initial/params.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/params']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/plural.js b/spec/expected/compile/initial/plural.js
index faa2399..5e50a39 100644
--- a/spec/expected/compile/initial/plural.js
+++ b/spec/expected/compile/initial/plural.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/plural_english.js b/spec/expected/compile/initial/plural_english.js
index b9b5942..1aff6c6 100644
--- a/spec/expected/compile/initial/plural_english.js
+++ b/spec/expected/compile/initial/plural_english.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_english']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_english']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/plural_escape.js b/spec/expected/compile/initial/plural_escape.js
index 9c912d3..b99cd57 100644
--- a/spec/expected/compile/initial/plural_escape.js
+++ b/spec/expected/compile/initial/plural_escape.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_escape']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_escape']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/script.js b/spec/expected/compile/initial/script.js
index 3c8bd15..e76107e 100644
--- a/spec/expected/compile/initial/script.js
+++ b/spec/expected/compile/initial/script.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/script']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/script']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/set_bar.js b/spec/expected/compile/initial/set_bar.js
index b6192c3..48b1c50 100644
--- a/spec/expected/compile/initial/set_bar.js
+++ b/spec/expected/compile/initial/set_bar.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_bar']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_bar']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/set_params.js b/spec/expected/compile/initial/set_params.js
index dd270fa..e9f7a39 100644
--- a/spec/expected/compile/initial/set_params.js
+++ b/spec/expected/compile/initial/set_params.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/set_params_inner.js b/spec/expected/compile/initial/set_params_inner.js
index d14ba25..36fb518 100644
--- a/spec/expected/compile/initial/set_params_inner.js
+++ b/spec/expected/compile/initial/set_params_inner.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params_inner']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params_inner']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/short_tag.js b/spec/expected/compile/initial/short_tag.js
index 8538a3d..8971337 100644
--- a/spec/expected/compile/initial/short_tag.js
+++ b/spec/expected/compile/initial/short_tag.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/short_tag']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/short_tag']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/strict.js b/spec/expected/compile/initial/strict.js
index 2cf3ee5..51a51c8 100644
--- a/spec/expected/compile/initial/strict.js
+++ b/spec/expected/compile/initial/strict.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/strict']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/strict']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/text.js b/spec/expected/compile/initial/text.js
index ea41f8f..478cbd1 100644
--- a/spec/expected/compile/initial/text.js
+++ b/spec/expected/compile/initial/text.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/text']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/text']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/useless_set.js b/spec/expected/compile/initial/useless_set.js
index d5c98b1..6f43a86 100644
--- a/spec/expected/compile/initial/useless_set.js
+++ b/spec/expected/compile/initial/useless_set.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/useless_set_include.js b/spec/expected/compile/initial/useless_set_include.js
index 8169e1d..8caaa52 100644
--- a/spec/expected/compile/initial/useless_set_include.js
+++ b/spec/expected/compile/initial/useless_set_include.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_include']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_include']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/useless_set_select.js b/spec/expected/compile/initial/useless_set_select.js
index 3c77cbc..49c708f 100644
--- a/spec/expected/compile/initial/useless_set_select.js
+++ b/spec/expected/compile/initial/useless_set_select.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_select']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_select']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/value.js b/spec/expected/compile/initial/value.js
index 37b3629..69d9d66 100644
--- a/spec/expected/compile/initial/value.js
+++ b/spec/expected/compile/initial/value.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/value']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/value']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/var.js b/spec/expected/compile/initial/var.js
index fe153a7..1d44bbc 100644
--- a/spec/expected/compile/initial/var.js
+++ b/spec/expected/compile/initial/var.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/var']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/var']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/initial/xss.js b/spec/expected/compile/initial/xss.js
index 3585c71..687ec22 100644
--- a/spec/expected/compile/initial/xss.js
+++ b/spec/expected/compile/initial/xss.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/xss']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/xss']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/attribute.en_US.js b/spec/expected/compile/translated/attribute.en_US.js
index 27350d1..5b70520 100644
--- a/spec/expected/compile/translated/attribute.en_US.js
+++ b/spec/expected/compile/translated/attribute.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/attribute_expression.en_US.js b/spec/expected/compile/translated/attribute_expression.en_US.js
index 3d9c7bd..ef63306 100644
--- a/spec/expected/compile/translated/attribute_expression.en_US.js
+++ b/spec/expected/compile/translated/attribute_expression.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute_expression.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/attribute_expression.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/block_for_include.en_US.js b/spec/expected/compile/translated/block_for_include.en_US.js
index 01ecec6..e2b9535 100644
--- a/spec/expected/compile/translated/block_for_include.en_US.js
+++ b/spec/expected/compile/translated/block_for_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_for_include.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_for_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/block_unsuspected_recursion.en_US.js b/spec/expected/compile/translated/block_unsuspected_recursion.en_US.js
index b5ed409..6e6037e 100644
--- a/spec/expected/compile/translated/block_unsuspected_recursion.en_US.js
+++ b/spec/expected/compile/translated/block_unsuspected_recursion.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_unsuspected_recursion.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_unsuspected_recursion.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/block_with_include.en_US.js b/spec/expected/compile/translated/block_with_include.en_US.js
index f46fbf2..5f782a9 100644
--- a/spec/expected/compile/translated/block_with_include.en_US.js
+++ b/spec/expected/compile/translated/block_with_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_include.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/block_with_params.en_US.js b/spec/expected/compile/translated/block_with_params.en_US.js
index 03e360f..438ae03 100644
--- a/spec/expected/compile/translated/block_with_params.en_US.js
+++ b/spec/expected/compile/translated/block_with_params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_params.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/block_with_params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/blocks.en_US.js b/spec/expected/compile/translated/blocks.en_US.js
index e9db8b2..9c6a181 100644
--- a/spec/expected/compile/translated/blocks.en_US.js
+++ b/spec/expected/compile/translated/blocks.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/blocks.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/blocks.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/call.en_US.js b/spec/expected/compile/translated/call.en_US.js
index 488be4a..ce3db08 100644
--- a/spec/expected/compile/translated/call.en_US.js
+++ b/spec/expected/compile/translated/call.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/call.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/call.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/cdata.en_US.js b/spec/expected/compile/translated/cdata.en_US.js
index cad82c2..26c5ca4 100644
--- a/spec/expected/compile/translated/cdata.en_US.js
+++ b/spec/expected/compile/translated/cdata.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/cdata.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/cdata.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/choose.en_US.js b/spec/expected/compile/translated/choose.en_US.js
index 5811b05..dfb8130 100644
--- a/spec/expected/compile/translated/choose.en_US.js
+++ b/spec/expected/compile/translated/choose.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/choose.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/choose.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/comment.en_US.js b/spec/expected/compile/translated/comment.en_US.js
index fb4a4db..a7ca4eb 100644
--- a/spec/expected/compile/translated/comment.en_US.js
+++ b/spec/expected/compile/translated/comment.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/comment.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/comment.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/doctype.en_US.js b/spec/expected/compile/translated/doctype.en_US.js
index 1591c12..747de46 100644
--- a/spec/expected/compile/translated/doctype.en_US.js
+++ b/spec/expected/compile/translated/doctype.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/doctype.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/doctype.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/each.en_US.js b/spec/expected/compile/translated/each.en_US.js
index e802744..1e6eb94 100644
--- a/spec/expected/compile/translated/each.en_US.js
+++ b/spec/expected/compile/translated/each.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/each.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/each.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/element.en_US.js b/spec/expected/compile/translated/element.en_US.js
index 13eea8b..cdff539 100644
--- a/spec/expected/compile/translated/element.en_US.js
+++ b/spec/expected/compile/translated/element.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/element.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/element.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/for.en_US.js b/spec/expected/compile/translated/for.en_US.js
index 9aa3fa1..0b41236 100644
--- a/spec/expected/compile/translated/for.en_US.js
+++ b/spec/expected/compile/translated/for.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/for.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/for.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/if.en_US.js b/spec/expected/compile/translated/if.en_US.js
index c615211..9f867f4 100644
--- a/spec/expected/compile/translated/if.en_US.js
+++ b/spec/expected/compile/translated/if.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/if.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/if.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/include.en_US.js b/spec/expected/compile/translated/include.en_US.js
index c968eb4..f3c8e42 100644
--- a/spec/expected/compile/translated/include.en_US.js
+++ b/spec/expected/compile/translated/include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/include.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/include_foreach.en_US.js b/spec/expected/compile/translated/include_foreach.en_US.js
index e20941f..34dd332 100644
--- a/spec/expected/compile/translated/include_foreach.en_US.js
+++ b/spec/expected/compile/translated/include_foreach.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/include_foreach.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/include_foreach.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/insert.en_US.js b/spec/expected/compile/translated/insert.en_US.js
index c5715cd..6601f3c 100644
--- a/spec/expected/compile/translated/insert.en_US.js
+++ b/spec/expected/compile/translated/insert.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/insert.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/insert.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/intercept.en_US.js b/spec/expected/compile/translated/intercept.en_US.js
index 4fd97e2..cb72194 100644
--- a/spec/expected/compile/translated/intercept.en_US.js
+++ b/spec/expected/compile/translated/intercept.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/intercept.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/intercept.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/issue_64.en_US.js b/spec/expected/compile/translated/issue_64.en_US.js
index 6195666..bf9702e 100644
--- a/spec/expected/compile/translated/issue_64.en_US.js
+++ b/spec/expected/compile/translated/issue_64.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/issue_64.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/issue_64.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/message.en_US.js b/spec/expected/compile/translated/message.en_US.js
index 7cd5aef..bb33924 100644
--- a/spec/expected/compile/translated/message.en_US.js
+++ b/spec/expected/compile/translated/message.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/message.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/message.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/params.en_US.js b/spec/expected/compile/translated/params.en_US.js
index 1e0ac78..a8c1e92 100644
--- a/spec/expected/compile/translated/params.en_US.js
+++ b/spec/expected/compile/translated/params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/params.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/plural.en_US.js b/spec/expected/compile/translated/plural.en_US.js
index dd5d455..c8db368 100644
--- a/spec/expected/compile/translated/plural.en_US.js
+++ b/spec/expected/compile/translated/plural.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/plural_english.en_US.js b/spec/expected/compile/translated/plural_english.en_US.js
index fbefd97..46cd68e 100644
--- a/spec/expected/compile/translated/plural_english.en_US.js
+++ b/spec/expected/compile/translated/plural_english.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_english.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_english.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/plural_escape.en_US.js b/spec/expected/compile/translated/plural_escape.en_US.js
index e89b70d..f1bd738 100644
--- a/spec/expected/compile/translated/plural_escape.en_US.js
+++ b/spec/expected/compile/translated/plural_escape.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_escape.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/plural_escape.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/script.en_US.js b/spec/expected/compile/translated/script.en_US.js
index f8053de..9096544 100644
--- a/spec/expected/compile/translated/script.en_US.js
+++ b/spec/expected/compile/translated/script.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/script.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/script.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/set_bar.en_US.js b/spec/expected/compile/translated/set_bar.en_US.js
index 43a848a..fa235a0 100644
--- a/spec/expected/compile/translated/set_bar.en_US.js
+++ b/spec/expected/compile/translated/set_bar.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_bar.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_bar.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/set_params.en_US.js b/spec/expected/compile/translated/set_params.en_US.js
index 7683110..c9584da 100644
--- a/spec/expected/compile/translated/set_params.en_US.js
+++ b/spec/expected/compile/translated/set_params.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/set_params_inner.en_US.js b/spec/expected/compile/translated/set_params_inner.en_US.js
index 8b8e505..0fb816f 100644
--- a/spec/expected/compile/translated/set_params_inner.en_US.js
+++ b/spec/expected/compile/translated/set_params_inner.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params_inner.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/set_params_inner.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/short_tag.en_US.js b/spec/expected/compile/translated/short_tag.en_US.js
index 5d731a9..5e4aac1 100644
--- a/spec/expected/compile/translated/short_tag.en_US.js
+++ b/spec/expected/compile/translated/short_tag.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/short_tag.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/short_tag.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/strict.en_US.js b/spec/expected/compile/translated/strict.en_US.js
index d930ed2..0ceeca6 100644
--- a/spec/expected/compile/translated/strict.en_US.js
+++ b/spec/expected/compile/translated/strict.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/strict.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/strict.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/text.en_US.js b/spec/expected/compile/translated/text.en_US.js
index 56e4c5f..ee601c8 100644
--- a/spec/expected/compile/translated/text.en_US.js
+++ b/spec/expected/compile/translated/text.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/text.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/text.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/useless_set.en_US.js b/spec/expected/compile/translated/useless_set.en_US.js
index 86e5586..bb02d86 100644
--- a/spec/expected/compile/translated/useless_set.en_US.js
+++ b/spec/expected/compile/translated/useless_set.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/useless_set_include.en_US.js b/spec/expected/compile/translated/useless_set_include.en_US.js
index d48d23b..c5e1091 100644
--- a/spec/expected/compile/translated/useless_set_include.en_US.js
+++ b/spec/expected/compile/translated/useless_set_include.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_include.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_include.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/useless_set_select.en_US.js b/spec/expected/compile/translated/useless_set_select.en_US.js
index 15b633c..8997e6c 100644
--- a/spec/expected/compile/translated/useless_set_select.en_US.js
+++ b/spec/expected/compile/translated/useless_set_select.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_select.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/useless_set_select.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/value.en_US.js b/spec/expected/compile/translated/value.en_US.js
index 8610b51..5555433 100644
--- a/spec/expected/compile/translated/value.en_US.js
+++ b/spec/expected/compile/translated/value.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/value.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/value.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/var.en_US.js b/spec/expected/compile/translated/var.en_US.js
index ddaab3d..84720ff 100644
--- a/spec/expected/compile/translated/var.en_US.js
+++ b/spec/expected/compile/translated/var.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/var.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/var.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",
diff --git a/spec/expected/compile/translated/xss.en_US.js b/spec/expected/compile/translated/xss.en_US.js
index 7640499..a2147b9 100644
--- a/spec/expected/compile/translated/xss.en_US.js
+++ b/spec/expected/compile/translated/xss.en_US.js
@@ -1,4 +1,4 @@
-;(function(){var x=function(x){return x;}(this);if(!x['fest'])x['fest']={};x['fest']['spec/templates/xss.en_US']=function(__fest_context) {
+;(function(){var x=Function('return this')();if(!x['fest'])x['fest']={};x['fest']['spec/templates/xss.en_US']=function(__fest_context) {
     "use strict";
     var __fest_self = this,
         __fest_buf = "",