At long last I’ve upgraded to D7. My old D5 site had been the victim of a lot of my module and core development. The biggest road bump in the entire process was moving all my old imagefields to the new field api. The stock upgrade path was completely kaput because of my tinkering. Huzzah.