mclow.lists accepted this revision. mclow.lists added a comment. This revision is now accepted and ready to land. This looks very mechanical, except for the changes to test_allocator.h, and that's a bug fix. http://reviews.llvm.org/D12135