further generics simplifications