Fix build with Cabal-1.20 - closes #21