More work on converting to CoffeeScript