This is still a 4-space indent. This code has all been reformatted with:

- a 2-space indent.
- the opening brace on the same line as the condition.

If there's a sense that this is the wrong style, we should probably have a bigger
discussion...