I always thought that the dialogue between Luke and Leia in Return of the Jedi should have been edited in the special edition.
An editor could cut “Do you remember your mother . . . your real mother?” to “Do you remember your mother?”
Then the inconsistency with the prequels could be easily resolved.