Patch(es) are in theory ready; doing some additional testing (not tested 
on in-tree guile-build-system packages yet) ...