(#13289) Fix some more style violations