Callback tweaks

It's a little crazy that this information isn't already passed through to these callbacks. See the SO question linked to in the issue below. I'd like to include this in a 1.1.1 minor update.

Fixes #520