Updates to support closed type families.