ReSharper code cleanup

Still playing with ReSharper.  Decided to use curly braces around simple
conditionals after reading some style discussions on this topic, and
used R# code cleanup to enforce it in this project.