More refactoring on client related to study annotation types.