follow-up to r75761: coding style tweaks