Change how generic subtype mapper are generated