Refactor _Events.groovy so it will compile