Applied to guix master as 9f7d66656646fac3746c52216ad6061c9c0adc27.  Thanks!