handle deprecated pre-defined types for 17.0 and later