Subject: Clean-up of package phases

From: Kei Kebreau <[email-masked]>
Date: Tue, 01 Aug 2017 03:18:01 -0400

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.