SI-7017 Improve interactions between j.l.Comparable & s.m.Ordered