Yes, that's a good point!

Instead, you can refer to the "gender assigned at birth" if necessary to refer to this at all.