Follow GHC build system changes