Started separating expressions and statements to remove infinite recursion with infix.