Additoinal cleanup from r52910
Approved by: doceng (core) Differential Revision: https://reviews.freebsd.org/D19901