_s: Use braces in all conditionals.

Formatting updates for file comment, conditional braces, and indentation.