r18882: make style consistent