Tidy up CallbackManager very slightly.
Merge pull request #43 from csmith/master

Tidy up CallbackManager very slightly.