fixup! Add event subscription tracking object to simplify per-frame subscriptions