G M: Make shared_ptr a little more gentle for some compilers.  No impact on clang.