Slight change to the ordering to ensure that function_x always comes before new_x; this is important for Orion's smart completion algorithm.