More clean up of auto-translated code to more idiomatic CoffeeScript style.