Start replacing EventEmitter references with EventHandlers