Reduce the diff with core

I realize some styling fixes and such are lost but such is the price to pay to reduce the diff.

We will have to go through a thorough license header update once the merge is over.