Parse errors

With recent code changes, all sample queries in the text file above parse well except:

SELECT * FROM {mytable} WHERE (a = 1 AND b = 'foo' OR (c = 'bar'))

The last condition in the converted expession is not an OR condition.