I remember thinking that "anakin builds 3PO" in TPM had to me rubbish. I was wrong. Well, it was "rubbish" as far as plot went (IMO), but it was also in TPM alright. And I also remember thinking that 3PO's head being swapped with a battledroid in AOTC was rubbish... I'm a slow learner.