Added type variables to string_of_type