Second round of @dirrm* cleanup.

Differential Revision:	https://reviews.freebsd.org/D882
Reviewed by:	bcr
Sponsored by:	Absolight