Minor misc edits.

No functional changes.