Port to Cabal 1.18