[bugfix] Fix column number
[bugfix] Fix whitespace issue and also allow combinatorial expressions to be used inside if expressions