Adam, I think a more respectful way of including trans members of our community would be to count them as the gender they identify with (assuming you know). You'll still end up with a category for nonbinary of course.