Update for current GHC HEAD

This involves changes to closed type family syntax and changes to
singletons.