Merge pull request #522 from danvk/callback-tweaks