=== modified file 'stagebuilder.prolog'
--- stagebuilder.prolog	2011-11-16 22:23:18 +0000
+++ stagebuilder.prolog	2011-11-16 21:43:52 +0000
@@ -215,7 +215,7 @@
 %     maplist(cmd_repr, Commands).
 
 flat_cmds(X, List) :-
-    (  is_list(X)
+    (  list(X)
     -> List = X
     ;  X = A + B
     -> flat_cmds(A, AList),
@@ -223,7 +223,7 @@
        append(AList, BList, List)
     ;  functor(X, _Name, _),
        arg(1, X, List),
-       (  is_list(List)
+       (  list(List)
        -> true
        ;  throw('functor does not have command list as first argument:' + X)
        )
@@ -405,7 +405,7 @@
     -> put_assoc(File, Assoc, String + '\n' + Prev, NewAssoc)
     ;  put_assoc(File, Assoc, String, NewAssoc)
     ),
-    aggregate_package_echo(Rest, NewAssoc, Result).
+    aggregate_package_echo([Rest], NewAssoc, Result).
 
 package_echo_dir(Dir, File-String, echo_append(String, Dir +/+ File)).
 
@@ -520,8 +520,8 @@
     [chroot(Dir, ['emerge -uDN $( cat /root/prosys/world )'])],
     create_stage(Name + '_stage4', Dir).
 
-target(Commands, Name, Dir) :-
-    phrase(target(Name, Dir), Commands).
+target(Commands, Foo, Dir) :-
+    phrase(target(Foo, Dir), Commands).
 
 target(i686_hardened_stage3, Dir) -->
     create_gentoo_builddir(i686_hardened, Dir),