Refactor EventContext for clarity.