Add some braces to appease certain gcc versions