Some mild refactoring of the BinaryHeap code. style only