Fix problems noted by NB in review <https://info.ravenbrook.com/mail/2014/06/11/20-47-37/0/>
Catch-up merge from master sources @186528 to branch/2014-04-15/mvffnoseg.