Small fixes following review <https://info.ravenbrook.com/mail/2013/07/11/13-17-56/0/>.