Ok, that does totally make sense.  You really did some good work on this branch.  For one that is mostly re-organization, there are some key cleanups going on.

You were actually fixing something broken too, right?  Mostly about the HTML references?  Did it have chunk processing on HTML before?  Now they are just the reference chunks, it seems.