intrusive_ptr reorg