This resolves the persistent leak test failures that we were getting on
trunk. The Linux builders are still recovering from their associated
clobber, but are looking good so far.
For those using Linux nightlies, please keep an eye out for any issues
and file bugs in the normal place.
Mark.