I was reluctant to depend on mcompat, which is also going away. But probably not first, so it's just as easy. Which also eliminates having two visible classes named Type, which helps.