Followup to r85922: Adapt to MW-coding style