That was not fanservice, that was cringeworthy. I assume deliberately.
Also, regarding another, much smaller character...
The nude scene with Arya made me look up Maisie Williams' age because it occured to me they may have waited this long with a nude scene for her character because of her young age, but she's actually 22 already (so probably 20 or 21 at the time of filming).
Anyway, that was comedy gold anyway. From the moment she left The Hound and Beric it was obvious she would end up having sex with Gendry that night - and her interviewing him like it's a job application before basically ordering him to undress was just so absurd I couldn't help but laugh.
Another random thought : you noticed how much they talked about the crypt and pointed out that that was where the women and children would be so they be safe....something terrible is going to happen in that crypt.