Continue cleaning up `collections::binary_heap`

Some more tidying up.
Can this just be a map?