Continue cleaning up `collections::binary_heap`

Some more tidying up.
I ran `make check` on this and everything passed. What was the error?