OK, I was able to get a look at this with an external diff tool. Mostly looks really good, a few comments below.