Full warning message: statement aligned as second statement in if body but not
in a statement block.

To make the warning go away, put braces around the if-ed statement (a for
statement). Leaves the stuff afterwards still oddly indented but will fix that
in a separate commit.

Change-Id: I875569de8aa7ff587eda0da241723c900486dd43