diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/asm/MethodInfoVisitor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/asm/MethodInfoVisitor.java
index d07bfbceef..36244b4c84 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/asm/MethodInfoVisitor.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/asm/MethodInfoVisitor.java
@@ -23,12 +23,29 @@ class MethodInfoVisitor extends MethodVisitor {
     
     @Override
     public AnnotationVisitor visitAnnotationDefault() {
-        return new DefaultAnnotValueVisitor(execStub.getResolver());
+        return new SymbolicValueBuilder(execStub.getResolver()) {
+            @Override
+            protected void acceptValue(String name, SymbolicValue v) {
+                defaultAnnotValue = v;
+            }
+        };
     }
 
     @Override
     public AnnotationVisitor visitParameterAnnotation(int parameter, String descriptor, boolean visible) {
-        return new ParameterAnnotVisitor(execStub.getResolver(), parameter, visible, descriptor);
+        return new SymbolicValueBuilder(execStub.getResolver()) {
+            private final SymbolicAnnotationImpl annot = new SymbolicAnnotationImpl(getResolver(), visible, descriptor);
+
+            @Override
+            protected void acceptValue(String name, SymbolicValue v) {
+                annot.addAttribute(name, v);
+            }
+
+            @Override
+            public void visitEnd() {
+                execStub.addParameterAnnotation(parameter, annot);
+            }
+        };
     }
 
     @Override
@@ -47,39 +64,4 @@ class MethodInfoVisitor extends MethodVisitor {
         return new AnnotationBuilderVisitor.TypeAnnotBuilderImpl(execStub.getResolver(), execStub, typeRef, typePath, visible, descriptor);
     }
 
-    private class DefaultAnnotValueVisitor extends SymbolicValueBuilder {
-
-        DefaultAnnotValueVisitor(AsmSymbolResolver resolver) {
-            super(resolver);
-        }
-
-        @Override
-        public void visitEnd() {
-            assert this.result != null;
-            defaultAnnotValue = this.result;
-        }
-    }
-
-    private class ParameterAnnotVisitor extends SymbolicValueBuilder {
-
-        private final SymbolicAnnotationImpl annot;
-        private final int paramIndex;
-        
-        ParameterAnnotVisitor(AsmSymbolResolver resolver, int paramIndex, boolean visible, String descriptor) {
-            super(resolver);
-            this.annot = new SymbolicAnnotationImpl(resolver, visible, descriptor);
-            this.paramIndex = paramIndex;
-        }
-        
-        @Override
-        protected void acceptValue(String name, SymbolicValue v) {
-            annot.addAttribute(name, v);
-        }
-
-        
-        @Override
-        public void visitEnd() {
-            execStub.addParameterAnnotation(paramIndex, annot);
-        }
-    }
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/asm/SymbolicValueBuilder.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/asm/SymbolicValueBuilder.java
index 83639a26f7..216d3cf189 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/asm/SymbolicValueBuilder.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/internal/asm/SymbolicValueBuilder.java
@@ -15,12 +15,8 @@ import net.sourceforge.pmd.lang.java.symbols.SymbolicValue;
 import net.sourceforge.pmd.lang.java.symbols.SymbolicValue.SymArray;
 import net.sourceforge.pmd.lang.java.symbols.SymbolicValue.SymEnum;
 
-/**
- *
- */
-class SymbolicValueBuilder extends AnnotationVisitor {
+abstract class SymbolicValueBuilder extends AnnotationVisitor {
 
-    SymbolicValue result;
     private final AsmSymbolResolver resolver;
 
     SymbolicValueBuilder(AsmSymbolResolver resolver) {
@@ -28,10 +24,12 @@ class SymbolicValueBuilder extends AnnotationVisitor {
         this.resolver = resolver;
     }
 
-    protected void acceptValue(String name, SymbolicValue v) {
-        result = v;
+    AsmSymbolResolver getResolver() {
+        return resolver;
     }
 
+    protected abstract void acceptValue(String name, SymbolicValue v);
+
 
     @Override
     public void visitEnum(String name, String descriptor, String value) {