Fix some style problems, some of which are old, some new, and some inherited from UFS.
Fix some style problems, some of which are old, some new, and some
inherited from UFS.

Requested by:	bde, njl

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase