I'm not as clear on the other functions that use coalesce-with-event, which is why I didn't try to change them all. I'd be willing to take a stab at that, but it'll take me a while, given that I'll need to familiarize myself with the other uses of coalesce-with-event and both ensure tests work and the logic seems sound.