Clean up `collections::binary_heap`

Just a few simplifications.