Use CourseSet more extensively.