Switch to new type classes.