Fix some single-line if statements