Add explicit braces to quiet the "avoid dangling else" warning from clang.