handle deprecated pre-defined types for 17.0 and later
Merge pull request #5 from tsloughter/master

handle deprecated pre-defined types for 17.0 and later