Adapt to changes in Deriving_Typerepr