More refactoring related to StudyAnnotationTypeEditCtrl.