Change $event to $on and make into event name-keyed object; drop "text" property (non-standard?)