New heapspace_calculator for 1.1+