events: Clean up a bit