Further cleanup, started implementing BinomialHeap.