Style fixes, mostly trailing whitespace elimination.  No functional change.

Reported by:	pho
MFC after:	3 weeks