Simplify order field logic.