Remove some redundant parentheses.
Style consistency fixes.

The {{{/}}} Vim fold markers didn't get used much in practice, and
aren't used anywhere else.