Created attachment 28504 [details] refactoring of JavaClass, FieldOrMethod, and AnnotationEntry JavaClass.getAnnotationEntries() and FieldOrMethod.getAnnotationEntries() are overly complex. FieldOrMethod.addAnnotationEntry() appears to be in the wrong place - FieldGenOrMethodGen.addAnnotationEntry() is the proper method to use.