From superficial multiculturalism to a ‘pedagogy of productive diversity’