Moving more stuff to coffeescript