Quick style updates and fixes.

@DFurnes