Fix problems identified in NB's review <https://info.ravenbrook.com/mail/2014/05/12/15-10-13/0/>.