Fix events still using the old Cancellable interface.