Tweak events data. Closes #354.