Properly clean up, when a (Tcl 8.6) thread is canceled.
merge-mark