Embed some callbacks to avoid having to attach waiter objects