I had an initial look, seems reasonable to kill `isTerminated` there too. Would it make sense to make that a separate PR or better as part of this one? Will give it a shot once done with family stuffs today.