fixup! Refactor Cabal layer functions