No subject

[John Wright]

This patch fixes a few bugs that Julien Cristau reported.  Since they
were all in the same chunk of code, I just fixed them all at once.  If
it makes anybody uncomfortable that it's one big patch, I'd be happy to
split it up.

I'm not sure if anybody's really reviewing patches on this list these
days...  If I don't hear anything, I plan to push the commit on July 6.

Thanks!