Second round of Typeable changes for GHC v7.7