Checkpoint before changing type assumption in some event handlers.
Modified event type assumption to be dict, rather than still a json string in several handlers.