Continue cleaning up `collections::binary_heap`

Some more tidying up.
I didn't investigate the claim, but the comment on `sift_up` indicated that swaps were inefficient. Using swaps does seem cleaner, however.