Follow GHC changes (#479)