event_parser: merge in some changes from another machine