Style nit fixups

Followup work for #2509