Oh, right, I don’t care too much for the reordering of the lines. I was just referring to the rewording of the new line that I prefer. His new line does not necessarily rely on the two sentences afterwards being swapped.
I’ll take a look at the 3PO thing at some point this week. I do think the old lines stick out, so I’m surprised to hear the new ones weren’t at least usable.