Make it so we're further taking advantage of the "multi-return" of coffeescript.  Gotta
say, this is actually making the code a lot cleaner.