I'm reviewing patches before guix 0.15.0. This patchset looks like a good candidate for inclusion, but patches do not apply cleanly on current master. Ludo already said that these are ok to push. Can you create updated patches, and push them, or submit them?