Minor updates in response to review.  See https://info.ravenbrook.com/mail/2014/02/17/16-27-18/0/
Fixing up the build on FreeBSD (fri3gc)