Tidy up CallbackManager very slightly.