Style fixes for changes from v2_5_0..ad84f06.
Merge pull request #326 from nathan-at-digitalfish/fix_style

Style fixes