derive(Ord,PartialOrd) in more places
There are a few types where we implement Ord and PartialOrd ourselves, but we could use
#[derive(Ord,PartialOrd)] instead. They include:
We should make this change only after double-checking that there are enough unit tests to be sure that the results are unchanged.