Right, that's what I was putting as my scenario #1. #2 is adding gender-neutral restrooms and not allowing trans women in women's restrooms.

Ah, then I'd clarify that gendered restrooms based on self-identification are a different option distinct from calling all existing restrooms gender neutral.

Well, of course! But the two scenarios were due to the upthread (GGP? something) suggestion that adding gender-neutral restrooms like SF did would resolve Rowling's complaints.