Additional work on callbacks.