This should get the build passing on ghc-7.4.