Student Diversity, Choice, and School Improvement