Some of the later patches in my large set still lack the "it actually works" feature that everybody is raving about nowadays. Here is some (related) intermediary cleanup while I restructure the patches not to break the cache.