More work on generic containers.