“The two concepts, the social and biological understandings of diversity, have been doing this sort of dance around each other, and sometimes they’re in productive juxtaposition.