Assorted code-style triviality

No functional change.