Cleaned up concurrency handling in EventService.