Another round of indentation changes: Position braces consistently,