Fix problems identified by NB in review <https://info.ravenbrook.com/mail/2014/07/24/12-21-04/0/>.