r9116: cleaning up eventlog code