r22969: fix some more places where we could end up with more than one event