Clean up `collections::binary_heap`

Just a few simplifications and a missing `assert!`.
I would prefer to make this if/else multi-line.