Fix problems identified by DL in review <https://info.ravenbrook.com/mail/2014/05/23/12-44-54/0/>.