More cabal cleanup, in preparation for creating a source distribution