Implement horrible way to factor out some stuff. Need to do better.
Merge branch 'blob-xml' into blob-xml-after-posting-for-review
Remove hack.
Remove whitespace.
Unbackout.
Refactor v2, fix tests.
More refactoring - need to fix whitelisting.
Fix a small thing