Update for Cabal 0.17 - damned breakage.