I was thinking the upgrade shell might be better as well. Munging the fixtures might be simpler in terms of long term maintainability and correctness.

Would updating a the upgrade shell to include a munger, and issuing warnings/exceptions when old style fixtures are found sound reasonable?