Add a parenthesis

This will allow things like if (foo > MAX(bar1, bar2))
Simplify the code by sharing more functions