Fixed folding of operator overloads