Added support for if statements within calls and expressions