Changes from review <https://info.ravenbrook.com/mail/2013/07/10/14-38-35/0/>.