I have a patch ready (that seems to work) that does 99.9% of these changes.
I am not sure that it cleans up a lot, but I guess it is a bit saner anyway. There shouldn't bee too many "ws only" chunks in this patch, but there might be some. Please comment. (I had to zip this... size unzipped ~200kB)
bufferview-1.diff.bz2
Description: BZip2 compressed data
-- Lgb