(check-)style related changes
(cherry picked from commit 21582c4)