Wrote some XSLT to align and normalize all the Masher files, and was able to rebuild the whole site with the new HotPot 7. Posted it for a look by MN and LB. There may be a bit more work, but this is now mostly done, I think. The site builds quite rapidly (around 20 minutes) on my new machine.