Adding braces to if/else. #638