Agreed.

I've been retraining myself to default to singular they. https://en.wikipedia.org/wiki/Singular_they

Old dog, new tricks. But I'm slowly adapting.