Work in progress editing in Daniel's combined email.
Edit done through added allocator constructor signatures.
Finish changes from Daniel's email of Sept 22.