Unify the binheap and sbinheap APIs.

This patch makes minor API changes to binheap
and sbinheap to make their APIs match. This
should make it easier for each to be a drop-in
replacement for the other.