Minor header cleanup.
Latest string changes.