These patches address some issues with our package definitions, as
partially discussed with Mark on guix-devel. I believe I've corrected
all the cases that are fit for Guix's master branch.