Read the condition off the whole expression

Drill down on conditions with commas was parsing only up to the first comma; switched to a full-expression parser that respects nesting.