I know this is not in the diff, but does CourseEmail need multiple inheritance?  Seems like it should just be a child of Email