Continue cleaning up `collections::binary_heap`

Some more tidying up.
(same comment for `with_capacity` below)