Changes for CoffeeScript 1.8

**NOT TO BE MERGED YET**