Yeah definitely -- it seems like there is a lot we could do to make things both simpler and more efficient.

I wonder if in the meantime we should maybe merge this in (or something like it) though?  To stop the bad data temporarily at least?