More cleanups of SharedPtr<> - but enanle_from_this<> still not really working