Allow Cabal 1.20 and 1.21