Style fixes

Style fixes for changes from v2_5_0 onward.