More indentation changes leftover from r29522: