This should eventually enable more certainty that they are still
live by the time we emit the event later.

Change-Id: I7c9eb4c000753d4efe8c59a9e13ef3e11c93b2fa