A couple more OwnPtrs bite the dust