Fix more operator precedence issues