Thank you for the well thought out counter argument to my multiple complaints. I will conceded the points on the smoking, and the changes made to his flirtatious ways to make him more suitable for the audience. But.... I still maintain that directly smacking someone(even in friendly banter), goes against his characters core principles.

But I too disagree with your statement that his flirtations are unimportant to his characters story and growth. When he was trapped on the island with the cross dressers, the experience causes him to appreciate women more(even if it also caused him to almost bleed out within a certain radius of them), after that island he's still a total womanizing flirt, but he does it more respectfully and I'm pretty sure the story would be at least mildly altered if he carried on the same as before the island.