I've found lots of odd building geometries and weird overlaps that don't seem to line up with any available aerial imagery while trying to make this update.
I've tried not to make anything worse, but needs a bit more attention and some more on the ground survey work.

Thanks for the nudge about the brand tags - I hadn't spotted them when making the initial change. A downside to making changes from a mobile!
I've just edited the node again, so everything should be consistent now.