diff --git a/Cakefile b/Cakefile
index bf2ee26d..dd0b6d46 100644
--- a/Cakefile
+++ b/Cakefile
@@ -12,13 +12,13 @@ option '-p', '--prefix [DIR]', 'set the installation prefix for `cake install`'
 
 task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options) ->
   base: options.prefix or '/usr/local'
-  lib:  base + '/lib/coffee-script'
-  bin: base + '/bin'
+  lib:  "$base/lib/coffee-script"
+  bin:  "$base/bin"
   exec([
-    'mkdir -p ' + lib + ' ' + bin
-    'cp -rf bin lib LICENSE README package.json src vendor ' + lib
-    'ln -sf ' + lib + '/bin/coffee ' + base + '/bin/coffee'
-    'ln -sf ' + lib + '/bin/cake ' + base + '/bin/cake'
+    "mkdir -p $lib $bin"
+    "cp -rf bin lib LICENSE README package.json src vendor $lib"
+    "ln -sf $lib/bin/coffee $base/bin/coffee"
+    "ln -sf $lib/bin/cake $base/bin/cake"
   ].join(' && '), (err, stdout, stderr) ->
    if err then print stderr
   )
diff --git a/lib/coffee-script.js b/lib/coffee-script.js
index 5f9d9f01..aef25e38 100644
--- a/lib/coffee-script.js
+++ b/lib/coffee-script.js
@@ -54,8 +54,8 @@
   exports.run = (function(code, options) {
     var __dirname, __filename;
     module.filename = (__filename = options.source);
-    __dirname = path.dirname(__filename, eval(exports.compile(code, options)));
-    return __dirname;
+    __dirname = path.dirname(__filename);
+    return eval(exports.compile(code, options));
   });
   // Extend CoffeeScript with a custom language extension. It should hook in to
   // the **Lexer** (as a peer of any of the lexer's tokenizing methods), and
diff --git a/src/coffee-script.coffee b/src/coffee-script.coffee
index 26516029..6f71125c 100644
--- a/src/coffee-script.coffee
+++ b/src/coffee-script.coffee
@@ -51,7 +51,7 @@ exports.nodes: (code) ->
 # setting `__filename`, `__dirname`, and relative `require()`.
 exports.run: ((code, options) ->
   module.filename: __filename: options.source
-  __dirname: path.dirname __filename
+  __dirname: path.dirname(__filename)
   eval exports.compile code, options
 )