Continue cleaning up `collections::binary_heap`

Some more tidying up.
Hmm, so full disclosure, I didn't actually compile this myself, but I always get an error such as
```
error: not all control paths return a value
help: consider removing this semicolon
```
for situations like this.  Though if this is not the case anymore than I stand corrected.