Initial work on new AnnotationRowMapper mapper implementation and
accompanying unit test.
Minor refactoring in the internals of AnnotationContentValuesMapper.