Yeah, that’s exactly right.
As for the second part, I’m not sure how to answer. Squeezing the partner is without a doubt adaptive, but squeezing anything that is roughly the same shape is a byproduct with no (strong) evolutionary pressure. Now, the question is whether functional necrophilia is adaptive or just a byproduct is very difficult to answer, but I lean towards byproduct.