Style fixes for #2174