A little bit of if-brace cleaning...