Refactor the TyVarTy case of 'match'. No change in behaviour.