Move generics to AllGenerics