[dllthomas]

I don't object to using "refactoring and ..." for such. I've weak objection, in terms of clarity and what we should be clear about, to using "refactoring" alone for it. I agree that it's not terribly uncommon.