Work in progress - fix CoffeeScript 1.6 breakages.