minor changes in event parsing scheme (again)