Refactored callback pass-ahead code on both platforms.