Coding style fixes for 3827217c0ad2768a5f4fc7f82f3a5c27d0fd77b1