Changes to OnCompleted.