This series removes more cleanups, using the by-now familiar techniques of replacing data structures with variants that have destructors. Regression tested by the buildbot; which by the way caught a problem in an early version of patch #3... having a builder for your host of choice really helps. Tom