Fix a performance bug introduced during the ObjC++ rewriting.
Add two caveats.