Coding-style fixes. No code changes.