Thanks!  Pushed both to guix master as commits
8c765a3b26cfcedf02208dfda151d154835f0b85 and
b6b257ed94a9f01451e9d1b1e3c72a2df21125b7.