7378290edb
Fix a number of style issues and attempt to reduce the diff to NetBSD. Reviewed by: glebius, kib Differential Revision: https://reviews.freebsd.org/D51773