Style changes as pointed out by stas@.

MFC after:	1 week