Handling the addCallback race condition better

Now handling this in a way that won’t sometimes invoke other callbacks
on the host thread.