Merge "Use switch in callback handler for events, and no EVENT_MORE_DATA"