finish module-ization of generated code

2 files changed, 3 insertions, 9 deletions

diff --git a/src/postamble.js b/src/postamble.js
index 448ee0fb..fb552606 100644
--- a/src/postamble.js
+++ b/src/postamble.js
@@ -48,10 +48,5 @@ function run(args) {
   }
 }
 
-try {
-  run(this.args ? this.args : (this.arguments ? this.arguments : []));
-} catch (e) {
-  print("Fatal exception: " + e);
-  throw e;
-}
+run(args);
 
diff --git a/src/shell.js b/src/shell.js
index 7c365d6d..3461681e 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -1,12 +1,11 @@
 
-var that = this;
 // Capture the output of this into a variable, if you want
 (function(Module, args) {
   Module = Module || {};
-  arguments = arguments || [];
+  args = args || [];
 
   {{BODY}}
 
   return Module;
-}).apply(this, this.arguments); // Replace parameters as needed
+})({}, this.arguments); // Replace parameters as needed