Stop using extremely deprecated TypeDesc defines