Continue cleaning up `collections::binary_heap`

Some more tidying up.
Should this be a "one-liner"? (seems to be the style here)