Remove overall diff noise.
Inline sole call of `some_ordering_const`; remove resulting dead code.