DELTASPIKE-742 improved type lookup