Mostly tiny generics improvements