Trade-offs and disappearing acts: shifting societal discourses of diversity in Canada over three decades