These are short, so I kept them all in one patch.

I was surprised that the existing Xfail test for temp file removal was
still failing, so I added some explanatory comments.  That one can
probably be fixed after release.