Some reorganization.
Added shortcut callbacks to requestor-gdeferred.