Make cancellation work better.