Fixed an issue with if-expressions and method/operator calls.
More infrastructure work.