@michaelwu
Fix handling of Heap<T>
d7e087e