Exactly.

Gender/sex should _ONLY_ be one's reproductive biology. Nothing else. There should be no cultural expectations about behavior based on one's reproductive biology. And most forms that ask for "sex/gender" should not - unless they are for a scientific study that requires that.