CDI-83, Move getAnnotatedType(s) to ABD