Further tweak our MPI finalise/abort handler.