Some style(9) fixes

MFC after:	1 month
X-MFC with: r259284