Side note unrelated to the acceptance of this PR: Do we want to use something like `once-later` to ensure callbacks are only called:
 1. Once
 1. On a future tick?