Update code to match new definition of GHC's HsTyVarBndr.
Merge branch 'master' into roles