Improve the management and propagation of "cancel"