Fix problems identified by RB in review <https://info.ravenbrook.com/mail/2014/05/29/13-01-02/0/>.
Catch-up merge from master sources @186335 to branch/2014-03-30/addrset.