Address another warnings reported by Patrick Laimbock when compiling
in userspace. While there, improve consistency.

MFC after: 1 week


git-svn-id: svn+ssh://svn.freebsd.org/base/head@271228 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f