Reviewing and merging my own year old patches from guix-patches mailing list 😄