Add braces around if() and while() blocks
release-2.x.y
2020-04-08, David Woodhouse