Fix some of the check-code-style complaints raised (but not caused) by !2412 (merged), !2465 (merged).