Add comments addressing points noted by DL in review <https://info.ravenbrook.com/mail/2014/06/04/14-08-35/0/>.
Fix problems identified by RB in review <https://info.ravenbrook.com/mail/2014/06/04/15-13-24/0/>.