Add removed TCE type definitions back.