Adapt old code to new, simpler eventing system.