Fix precedence of conditional terms