> I would do D, given that B will occur as part of the new-allocator, Don't count your chickens until they are hatched. First get that new allocator working for all targets, make it at least as good as the existing one, and then we can go about actually removing code that has been superceded.