Updates to support closed type families.
Merge branch 'master' into overlapping-tyfams