Heaps now take element-weight tuples