These have all been superseeded by Mark's per-objfile data pointers.

I'll look to commit this in a week,
Andrew