Second round of @dirrm* cleanup.

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


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@45707 c2e8774f-c49f-e111-b436-862b2bbc8956