Job cancellation: address Matei's code review feedback.