add/adjust event parsing helpers (#2794)