Prepare to add the event type to the event encoding.

#802