Yes, you have it right. That's the good news.
The bad news is there is now an warrant for your arrest in California for using the 'wrong', uh, gender pronoun (which in this case was the right pronoun but has been deemed to be the wrong pronoun ---dependent upon how the gender pronoun recipient is feeling during any particular moment in their life).
We've come a long way baby from the Momma's and the Papas.
Ha ha! My defense is that I used nouns, not pronouns!