Trac #12686 showed that we were allowing a term variable into
a type, by promotion.  I chose to squash this in the renamer.