Update for cabal 1.20. #46