Continue cleaning up `collections::binary_heap`

Some more tidying up.
er, lots of functions below!