more follow-up to r65715: coding style tweaks, etc.