STS-3312: return ITypes for future re-use