[C++ PATCH] operator name cleanup prepatch