OrderKey refactoring.