Merge pull request #7967 from jrose-apple/3.1-to-err-is-human

Make sure ErrorTypes containing type variables are marked as such