This is trying to strike a balance between updating as much existing classes as possible, but not making the diff too big...
And they should all work again.