Callbacks engage

This merge request was deemed huge, unwieldy, and unsuitable to be a patch. It is thus closed in favor of future smaller and more incremental patches based on it, which will be easier to test and review.