Lots of uncoordinated refactoring