A few more tweaks to make the coffeescript more concise.