Changed parser to allow combinatorial expressions as condition in if expressions