Style fixes.

Based on dalen's PR, I merged those in and fixed a few more bits.