Further work on event states.