diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 2853037797..9ba3c4b58e 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -120,8 +120,8 @@ version is returned."
 (define (read-cabal-and-hash port)
   "Read a cabal file and its base32 hash from a port."
   (let-values (((port get-hash) (open-sha256-input-port port)))
-    (cons (read-cabal (canonical-newline-port port))
-          (bytevector->nix-base32-string (get-hash)))))
+    (values (read-cabal (canonical-newline-port port))
+            (bytevector->nix-base32-string (get-hash)))))
 
 (define (hackage-fetch-and-hash name-version)
   "Return the Cabal file and hash for the package NAME-VERSION, or #f on
@@ -129,7 +129,7 @@ failure. If the version part is omitted from the package name, then return
 the latest version."
   (guard (c ((and (http-get-error? c)
                   (= 404 (http-get-error-code c)))
-             #f))                       ;"expected" if package is unknown
+             (values #f #f)))           ;"expected" if package is unknown
     (let-values (((name version) (package-name->name+version name-version)))
       (let* ((url (hackage-cabal-url name version))
              (port (http-fetch url))
@@ -141,9 +141,8 @@ the latest version."
   "Return the Cabal file for the package NAME-VERSION, or #f on failure.  If
 the version part is omitted from the package name, then return the latest
 version."
-  (match (hackage-fetch-and-hash name-version)
-         ((cabal . hash) cabal)
-         (_              #f)))
+  (let-values (((cabal hash) (hackage-fetch-and-hash name-version)))
+    cabal))
 
 (define string->license
   ;; List of valid values from
@@ -318,16 +317,14 @@ symbol 'true' or 'false'.  The value associated with other keys has to conform
 to the Cabal file format definition.  The default value associated with the
 keys \"os\", \"arch\" and \"impl\" is \"linux\", \"x86_64\" and \"ghc\"
 respectively."
-  (match
-    (if port (read-cabal-and-hash port)
-             (hackage-fetch-and-hash package-name))
-    ((cabal-meta . cabal-hash)
-     (and=> cabal-meta (compose (cut hackage-module->sexp <>
-                                     cabal-hash
-                                     #:include-test-dependencies?
-                                     include-test-dependencies?)
-                                (cut eval-cabal <> cabal-environment))))
-    (_ #f)))
+  (let-values (((cabal-meta cabal-hash)
+                (if port
+                    (read-cabal-and-hash (canonical-newline-port port))
+                    (hackage-fetch-and-hash package-name))))
+    (and=> cabal-meta (compose (cut hackage-module->sexp <> cabal-hash
+                                    #:include-test-dependencies?
+                                    include-test-dependencies?)
+                               (cut eval-cabal <> cabal-environment)))))
 
 (define hackage->guix-package/m                   ;memoized variant
   (memoize hackage->guix-package))