Continue cleaning up `collections::binary_heap`

Some more tidying up.
Do we actually have a style guide for this? All else equal I'd rather leave the semi off in a "one-liner" return like this.