Hi,

thanks!

Pushed your patch with some simplifications to guix master as commit
141262f266ab702c856f634889d4130ae661e79f.