add generic type information

Groovy 2.3 and JDK8 still are not going to allow this to compile.  More investigation pending.