Backport Joe's new commits to CoffeeScript