Thanks!

Pushed this and bug#34164 as commit 0a59cc6e8590fc6c2c56dc35aca5c4b558d67901 to
guix master.