Handle new C++ and Objective-C++ scope names