Drop some more useless braces around if/for constructs.