Began removing generics from Term types. Build broken.