Also fix a few bits of generic infrastructure along the way.

Approved by:	bapt (mentor)
Differential Revision:	https://reviews.freebsd.org/D2961