If there is any change to this, my actual recommendation would be to axe that second part, not the first, but that's a radical change that basically amounts to "stop treating humans as a special case when they're barbie doll anatomy'd just because the show mainly uses ferals" mixed with "please make this less stupidly complex". For the time being, please know that penis implying nudity is definitely correct.