Minor style fixes, no behavior change.

(I removed the parens to make that line fit in 80 cols.)