Improve infrastructure for Cabal file parsing