Some fixies in signatures

Some fixes to add missing parameters and naming consistency for callback
signatures, based on code review by tjvantoll.