CallbackWrapper: code improvement