Make cancellation token handling clearner in the operations queue. misc cleanup.