Minor simplification of event object, fixed 'addStatements'