Remove some {T}s from type definitions