Thanks for that patch!

Pushed to guix master as commits 663def11dfa560066a910ebf290df82bcd72bfbc
and 11491e1b1bdac1255f1f529f13b8eecabdb7cc66.