That's the approach I was thinking of taking, for pretty much those reasons.

(The fic I was mainly thinking of made the pronouns follow the sex of the body rather than the gender of the occupier... most of the time, anyway. I was wondering if other readers found that approach easier to read; I didn't.)