Update PartialOrd impl for upstream changes.