Add missing generics.