This patch series is the same as the last but cleaned up according to
guix lint.