Started changing event handlers (part of #241).