Some general cleanup.

This commit is primarily concerned with making consistent use of header
and other markup.
16 files changed