issue 6830: Better compliance with our coding style