Fix review comments from RB in <https://info.ravenbrook.com/mail/2013/05/23/18-17-17/0/>