It's trickier, because it sets up the pedo punchline a couple of times and then hits you from left field. 2 years out I can see why this version is problematic, but yeah, I like it more too.