small cleanups
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java
index f3658d6..ea3f7cb 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java
@@ -55,11 +55,11 @@
 
 @Privilizing(@CallTo(Reflection.class))
 public class HierarchyBuilder extends CompositeBuilder {
-    static abstract class HierarchyDelegate<E extends AnnotatedElement, T> {
-        final T delegate;
+    static abstract class HierarchyDelegate<E extends AnnotatedElement, D extends HasAnnotationBehavior> {
+        final D delegate;
         final Meta<E> hierarchyElement;
 
-        HierarchyDelegate(T delegate, Meta<E> hierarchyElement) {
+        HierarchyDelegate(D delegate, Meta<E> hierarchyElement) {
             super();
             this.delegate = Validate.notNull(delegate, "delegate");
             this.hierarchyElement = Validate.notNull(hierarchyElement, "hierarchyElement");
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java
index d9722ec..a8a6984 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java
@@ -162,7 +162,7 @@
 
                 final AnnotatedType[] typeArgs = container.getAnnotatedActualTypeArguments();
                 for (int i = 0; i < typeArgs.length; i++) {
-                    ContainerElementKey key = new ContainerElementKey(container, i);
+                    final ContainerElementKey key = new ContainerElementKey(container, i);
                     result.put(key, new ReflectionBuilder.ForContainer<>(new Meta.ForContainerElement(meta, key)));
                 }
                 return result;