Ensure curly-braces around control-flow