Cleaning up misc. other uses of AutoPtr