Improved generics.