Clean up `collections::binary_heap`

Just a few simplifications and a missing `assert!`.
Normally I would but the `if` itself on the same line to reduce the indentation level, but in this case I think it's fine like this.