Reindent after r16509.