Continue cleaning up `collections::binary_heap`

Some more tidying up.
Works for me (unless you want to investigate the claim and try to disprove it).