Add more types to the returned allocation

[gbaraldi]

This needs tests, but should bring the tpyes of allocations in 1.10/9 should be more correct.