Probably a small set of tweaks. You really can't relistically go beyond that, because structural changes quickly become a never-ending job of fixing merge conflicts.