This series removes a number of cleanups, replacing them with unique_xmalloc_ptr or other things, as appropriate. Regression tested by the buildbot. Tom