Made sure all events are using Event instances.

Signed-off-by: Grant Skinner <info@gskinner.com>