Fix Trac #3955: renamer and type variables