Improved generics all around.