A lot of the convolution goes away if you embrace the third-person singular "they". It sounds odd at first but I'm slowly adjusting to it as I hear it more and more.