Fix problems identified by DL in <https://info.ravenbrook.com/mail/2014/04/30/12-47-23/0/>.