Add some support for wrappers which are generic instances.