More progress on generics.