Make 2-opt more similar to 3-opt algorithm.

Let the function itself work until the tour is locally optimal.