Hi Brian,

I applied the first patch with these changes to address issues reported
by ‘guix lint’: