Removed the ugly raw-pointer-use duckling from the sea of conforming auto_ptrs.