Seven heavilty-internally-used fields, and then about a dozen secondary fields relating to them, maybe half a dozen methods relating to them, and then reassigning all the value assignments and usages of them that followed after. About... I dunno, maybe 2k lines of code changes in all. But the good thing is, the new way of doing it actually helps me find errors rather than obscuring them, and so I'm able to resolve a ton of bug reports (including at least two bugs that weren't even reported but that I found) all in one swoop. Then it just remains to be seen how many bugs this adds, but at least those are short-term concerns rather than band-aids on band-aids, which always leads to problems.