Improved generics usage.