Fix a few, but not all, clang warnings: Use "%s" to print modifiable

Fix a few, but not all, clang warnings: Use "%s" to print modifiable
strings, add a couple of braces, ansify a few functions, add and remove
a few extra parens.

ok jcs