remove remaining uses of ~[T]