Clean up cancellation patterns in callbacks and other small cleanups.