Remove some unnecessary braces and fix a gcc 3.4 warning.