Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state