These are not perfectly in agreement with each other style-wise, but they are orders of orders of magnitude more consistent style-wise than before.
This will make a number of things easier in the future, as well as (finally!) avoiding the Id-smashing problem which has plagued developers for so long. Boy, I'm glad we're not using sup anymore. This update would have been insane otherwise.