Assorted nitpicking code-style

No functional change.