This PR doesn't include where this is used, so I have to ask - is it intentional that the event key be `someEvent.undefined` or `someEvent.null` when `callbackId` is falsy?