Fix some indentation which went awry in r32677 and r32704 and some which has always been less than ideal.