ENH: Add handling of actual callbacks