Update for compatibility with GHC HEAD

This involves changes to closed type families and singletons.