Address code review comments.

- Remove unneeded curlies.
- Change a couple of defs to vals.