And one more batch of indentation fixes.