Rework the type variable infrastructure. Remove it from the type structure and have the auxiliary function cache the results as needed.