I've sent this a couple of weeks ago on the guix-devel list,
but no one seems to have noticed and applied it.

Appended patches are for the wip branch.
-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://dist.ng0.infotropique.org/dist/keys/
  WWW: https://ng0.infotropique.org