Oh, good, this was bothering me too. I think doing it as an event (which I faithfully preserved from the original version for some reason) obscures when it happens & makes it fragile, as you note.