renamed Set.h to ckset.h
authorGengbin Zheng <gzheng@illinois.edu>
Sat, 27 Mar 2010 01:37:18 +0000 (20:37 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Sat, 27 Mar 2010 01:37:18 +0000 (20:37 -0500)
src/ck-ldb/ckset.C [moved from src/ck-ldb/Set.C with 99% similarity]
src/ck-ldb/ckset.h [moved from src/ck-ldb/Set.h with 100% similarity]
src/ck-ldb/elements.h
src/scripts/Make.depends
src/scripts/Makefile

similarity index 99%
rename from src/ck-ldb/Set.C
rename to src/ck-ldb/ckset.C
index fe01e59cd2dfc3554341b3ebab86b9ff88210214..216ec3270174963859e3970c0cdc35eb96be007c 100644 (file)
@@ -16,7 +16,7 @@
 */
 /*@{*/
 
-#include "Set.h"
+#include "ckset.h"
 #include "elements.h"
 
 
similarity index 100%
rename from src/ck-ldb/Set.h
rename to src/ck-ldb/ckset.h
index 43eb9b0b05b8bc5b2fb531a57f0998b114488d8e..bb5999062b5bc4717c2fd1c6671029d2eaf96453 100644 (file)
@@ -22,7 +22,7 @@
 #include "converse.h"
 #include "lbdb.h"
 
-#include "Set.h"
+#include "ckset.h"
 #include "cklists.h"
 
 class minHeap;
index 306413bb3fa3466eed88c647eed417728e3efe95..24ed07daf7c434c6aecff1443a2ff6ca67b180b1 100644 (file)
 #generated by make depends
 convcore.o: convcore.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h sockRoutines.h conv-ccs.h \
-  ccs-server.h memory-isomalloc.h converseEvents.h traceCoreAPI.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h sockRoutines.h conv-ccs.h ccs-server.h \
+  memory-isomalloc.h converseEvents.h traceCoreAPI.h \
   converseProjections.h traceCoreCommon.h machineEvents.h \
   machineProjections.h quiescence.h cmibacktrace.c
        $(CHARMC) -c -I. convcore.c
 
 conv-conds.o: conv-conds.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h
        $(CHARMC) -c -I. conv-conds.c
 
 queueing.o: queueing.c queueing.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h converse.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h debug-conv.h
        $(CHARMC) -c -I. queueing.c
 
 msgmgr.o: msgmgr.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h
        $(CHARMC) -c -I. msgmgr.c
 
 cpm.o: cpm.c queueing.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h
        $(CHARMC) -c -I. cpm.c
 
 cpthreads.o: cpthreads.c cpthreads.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h converse.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h debug-conv.h
        $(CHARMC) -c -I. cpthreads.c
 
 futures.o: futures.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h
        $(CHARMC) -c -I. futures.c
 
 cldb.o: cldb.c queueing.h cldb.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h \
-  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h
        $(CHARMC) -c -I. cldb.c
 
 topology.o: topology.C charm.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h cklists.h topology.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h pup.h cklists.h topology.h
        $(CHARMC) -c -I. topology.C
 
 random.o: random.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h
        $(CHARMC) -c -I. random.c
 
 debug-conv.o: debug-conv.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h conv-ccs.h sockRoutines.h \
-  ccs-server.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h conv-ccs.h sockRoutines.h ccs-server.h
        $(CHARMC) -c -I. debug-conv.c
 
 generate.o: generate.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h typedefs.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h typedefs.h
        $(CHARMC) -c -I. generate.c
 
 edgelist.o: edgelist.c typedefs.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h
        $(CHARMC) -c -I. edgelist.c
 
 conv-ccs.o: conv-ccs.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckhashtable.h pup.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckhashtable.h pup.h
        $(CHARMC) -c -I. conv-ccs.c
 
 ccs-builtins.o: ccs-builtins.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h ckhashtable.h pup.h \
-  pup_toNetwork.h debug-charm.h cklists.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ccs-builtins.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h ckhashtable.h pup.h pup_toNetwork.h \
+  debug-charm.h cklists.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ccs-builtins.h
        $(CHARMC) -c -I. ccs-builtins.C
 
 traceCore.o: traceCore.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h traceCore.h traceCoreCommon.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h traceCore.h traceCoreCommon.h \
   converseEvents.h traceCoreAPI.h converseProjections.h charmEvents.h \
   charmProjections.h machineEvents.h machineProjections.h
        $(CHARMC) -c -I. traceCore.C
 
 traceCoreCommon.o: traceCoreCommon.C traceCore.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h traceCoreAPI.h traceCoreCommon.h charmProjections.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h traceCoreAPI.h traceCoreCommon.h \
+  charmProjections.h
        $(CHARMC) -c -I. traceCoreCommon.C
 
 tracec.o: tracec.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h trace-common.h tracec.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h trace-common.h tracec.h
        $(CHARMC) -c -I. tracec.C
 
 converseProjections.o: converseProjections.C converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h converseEvents.h traceCoreAPI.h converseProjections.h \
-  traceCoreCommon.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h converseEvents.h traceCoreAPI.h \
+  converseProjections.h traceCoreCommon.h
        $(CHARMC) -c -I. converseProjections.C
 
 machineProjections.o: machineProjections.C converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h machineEvents.h machineProjections.h traceCoreAPI.h \
-  traceCoreCommon.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h machineEvents.h \
+  machineProjections.h traceCoreAPI.h traceCoreCommon.h
        $(CHARMC) -c -I. machineProjections.C
 
 quiescence.o: quiescence.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h quiescence.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h quiescence.h
        $(CHARMC) -c -I. quiescence.c
 
 isomalloc.o: isomalloc.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h memory-isomalloc.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h memory-isomalloc.h
        $(CHARMC) -c -I. isomalloc.c
 
 mem-arena.o: mem-arena.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h mem-arena.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h mem-arena.h
        $(CHARMC) -c -I. mem-arena.c
 
 conv-counter.o: conv-counter.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h
        $(CHARMC) -c -I. conv-counter.c
 
 global-nop.o: global-nop.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h
        $(CHARMC) -c -I. global-nop.c
 
 cmipool.o: cmipool.c cmipool.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h
        $(CHARMC) -c -I. cmipool.c
 
 cpuaffinity.o: cpuaffinity.c converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h sockRoutines.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h sockRoutines.h
        $(CHARMC) -c -I. cpuaffinity.c
 
 cputopology.o: cputopology.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h sockRoutines.h cklists.h pup.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h sockRoutines.h cklists.h pup.h
        $(CHARMC) -c -I. cputopology.C
 
 modifyScheduler.o: modifyScheduler.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h
        $(CHARMC) -c -I. modifyScheduler.C
 
 trace-projections.o: trace-projections.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h trace-projections.h trace-common.h \
-  trace-projectionsBOC.h register.h ckcallback-ccs.h CkCallback.decl.h \
-  TraceProjections.decl.h TraceProjections.def.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h trace-projections.h trace-common.h trace-projectionsBOC.h \
+  register.h ckcallback-ccs.h CkCallback.decl.h TraceProjections.decl.h \
+  TraceProjections.def.h
        $(CHARMC) -c -I. trace-projections.C
 
 trace-summary.o: trace-summary.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h trace-summary.h register.h trace-common.h \
-  trace-summaryBOC.h ckcallback-ccs.h CkCallback.decl.h \
-  TraceSummary.decl.h TraceSummary.def.h
-       $(CHARMC) -c -I. trace-summary.C
-
-trace-simple.o: trace-simple.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
@@ -269,18 +242,18 @@ trace-simple.o: trace-simple.C charm++.h charm.h converse.h conv-config.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h trace-simple.h register.h trace-common.h trace-simpleBOC.h \
-  TraceSimple.decl.h TraceSimple.def.h
-       $(CHARMC) -c -I. trace-simple.C
+  envelope.h trace-summary.h register.h trace-common.h trace-summaryBOC.h \
+  ckcallback-ccs.h CkCallback.decl.h TraceSummary.decl.h \
+  TraceSummary.def.h
+       $(CHARMC) -c -I. trace-summary.C
 
-trace-counter.o: trace-counter.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+trace-simple.o: trace-simple.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -288,94 +261,112 @@ trace-counter.o: trace-counter.C charm++.h charm.h converse.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h
+  trace-bluegene.h envelope.h trace-simple.h register.h trace-common.h \
+  trace-simpleBOC.h TraceSimple.decl.h TraceSimple.def.h
+       $(CHARMC) -c -I. trace-simple.C
+
+trace-counter.o: trace-counter.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h
        $(CHARMC) -c -I. trace-counter.C
 
 trace-controlPoints.o: trace-controlPoints.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h trace-controlPoints.h register.h \
-  trace-common.h trace-controlPointsBOC.h TraceControlPoints.decl.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h trace-controlPoints.h register.h trace-common.h \
+  trace-controlPointsBOC.h TraceControlPoints.decl.h \
   TraceControlPoints.def.h
        $(CHARMC) -c -I. trace-controlPoints.C
 
 trace-utilization.o: trace-utilization.C trace-utilization.h charm++.h \
   charm.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h \
-  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h register.h trace-common.h ckcallback-ccs.h \
-  CkCallback.decl.h TraceUtilization.decl.h TraceUtilization.def.h
+  conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
+  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
+  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h register.h trace-common.h ckcallback-ccs.h CkCallback.decl.h \
+  TraceUtilization.decl.h TraceUtilization.def.h
        $(CHARMC) -c -I. trace-utilization.C
 
 trace-bluegene.o: trace-bluegene.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h trace-common.h blue.h blue-conv.h \
-  blue_impl.h ckliststring.h blue_types.h bigsim_timing.h bigsim_logs.h \
-  blue_defs.h bigsim_network.h
-       $(CHARMC) -c -I. trace-bluegene.C
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h trace-common.h blue.h blue-conv.h blue_impl.h ckliststring.h \
+  blue_types.h bigsim_timing.h bigsim_logs.h blue_defs.h bigsim_network.h
+       $(CHARMC) -c -I. trace-bluegene.C
 
 trace-projector.o: trace-projector.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h trace-projector.h ck.h qd.h register.h \
-  stats.h ckfutures.h ckIgetControl.h allEvents.h charmEvents.h \
-  charmProjections.h traceCoreAPI.h converseEvents.h \
-  converseProjections.h machineEvents.h machineProjections.h traceCore.h \
-  threadEvents.h traceCoreCommon.h trace-common.h trace-projections.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h trace-projector.h ck.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h allEvents.h charmEvents.h charmProjections.h \
+  traceCoreAPI.h converseEvents.h converseProjections.h machineEvents.h \
+  machineProjections.h traceCore.h threadEvents.h traceCoreCommon.h \
+  trace-common.h trace-projections.h
        $(CHARMC) -c -I. trace-projector.C
 
 trace-converse.o: trace-converse.c conv-trace.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h persistent.h debug-conv.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  persistent.h debug-conv.h
        $(CHARMC) -c -I. trace-converse.c
 
 trace-all.o: trace-all.C
@@ -383,41 +374,40 @@ trace-all.o: trace-all.C
 
 trace-memory.o: trace-memory.C trace-memory.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h trace-common.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h trace-common.h
        $(CHARMC) -c -I. trace-memory.C
 
 trace-common.o: trace-common.C charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckliststring.h \
-  trace.h trace-bluegene.h trace-common.h allEvents.h charmEvents.h \
-  charmProjections.h traceCoreAPI.h converseEvents.h \
-  converseProjections.h machineEvents.h machineProjections.h traceCore.h \
-  threadEvents.h traceCoreCommon.h register.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckliststring.h trace.h trace-bluegene.h trace-common.h \
+  allEvents.h charmEvents.h charmProjections.h traceCoreAPI.h \
+  converseEvents.h converseProjections.h machineEvents.h \
+  machineProjections.h traceCore.h threadEvents.h traceCoreCommon.h \
+  register.h
        $(CHARMC) -c -I. trace-common.C
 
 tracef.o: tracef.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -429,141 +419,102 @@ tracef.o: tracef.C charm++.h charm.h converse.h conv-config.h \
        $(CHARMC) -c -I. tracef.C
 
 init.o: init.C ck.h charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h qd.h register.h stats.h ckfutures.h ckIgetControl.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h
        $(CHARMC) -c -I. init.C
 
 register.o: register.C ck.h charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h qd.h register.h stats.h ckfutures.h ckIgetControl.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h
        $(CHARMC) -c -I. register.C
 
 qd.o: qd.C ck.h charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h qd.h register.h stats.h ckfutures.h ckIgetControl.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h
        $(CHARMC) -c -I. qd.C
 
 ck.o: ck.C ck.h charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h qd.h register.h stats.h ckfutures.h ckIgetControl.h crc32.h \
-  trace-common.h ckliststring.h CkMarshall.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h crc32.h trace-common.h ckliststring.h CkMarshall.def.h
        $(CHARMC) -c -I. ck.C
 
 main.o: main.C ck.h charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h qd.h register.h stats.h ckfutures.h ckIgetControl.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h
        $(CHARMC) -c -I. main.C
 
 msgalloc.o: msgalloc.C ck.h charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h qd.h register.h stats.h ckfutures.h ckIgetControl.h
-       $(CHARMC) -c -I. msgalloc.C
-
-ckfutures.o: ckfutures.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h ck.h qd.h register.h stats.h ckfutures.h ckIgetControl.h \
-  CkFutures.def.h
-       $(CHARMC) -c -I. ckfutures.C
-
-ckIgetControl.o: ckIgetControl.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -571,17 +522,17 @@ ckIgetControl.o: ckIgetControl.C charm++.h charm.h converse.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h ckIgetControl.h
-       $(CHARMC) -c -I. ckIgetControl.C
+  trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h
+       $(CHARMC) -c -I. msgalloc.C
 
-debug-message.o: debug-message.C ck.h charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+ckfutures.o: ckfutures.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -589,17 +540,17 @@ debug-message.o: debug-message.C ck.h charm++.h charm.h converse.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
-  ckIgetControl.h envelope.h queueing.h
-       $(CHARMC) -c -I. debug-message.C
+  trace-bluegene.h envelope.h ck.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h CkFutures.def.h
+       $(CHARMC) -c -I. ckfutures.C
 
-debug-charm.o: debug-charm.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h ckhashtable.h pup.h conv-ccs.h \
-  sockRoutines.h ccs-server.h debug-charm.h cklists.h charm.h middle.h \
-  middle-conv.h register.h ck.h charm++.h ckbitvector.h ckstream.h init.h \
-  simd.h CkMarshall.decl.h cksection.h ckcallback.h ckobjQ.h \
+ckIgetControl.o: ckIgetControl.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
   ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
@@ -608,17 +559,17 @@ debug-charm.o: debug-charm.C converse.h conv-config.h conv-autoconfig.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h qd.h stats.h ckfutures.h ckIgetControl.h
-       $(CHARMC) -c -I. debug-charm.C
+  envelope.h ckIgetControl.h
+       $(CHARMC) -c -I. ckIgetControl.C
 
-ckcallback.o: ckcallback.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+debug-message.o: debug-message.C ck.h charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
@@ -626,55 +577,109 @@ ckcallback.o: ckcallback.C charm++.h charm.h converse.h conv-config.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h ckcallback-ccs.h CkCallback.decl.h CkCallback.def.h
+  envelope.h qd.h register.h stats.h ckfutures.h ckIgetControl.h \
+  envelope.h queueing.h
+       $(CHARMC) -c -I. debug-message.C
+
+debug-charm.o: debug-charm.C converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h ckhashtable.h pup.h conv-ccs.h sockRoutines.h \
+  ccs-server.h debug-charm.h cklists.h charm.h middle.h middle-conv.h \
+  register.h ck.h charm++.h ckbitvector.h ckstream.h init.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h ckobjQ.h ckreduction.h \
+  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
+  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
+  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h lbdb++.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
+  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
+  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
+  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
+  trace.h trace-bluegene.h envelope.h qd.h stats.h ckfutures.h \
+  ckIgetControl.h
+       $(CHARMC) -c -I. debug-charm.C
+
+ckcallback.o: ckcallback.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h ckcallback-ccs.h CkCallback.decl.h \
+  CkCallback.def.h
        $(CHARMC) -c -I. ckcallback.C
 
 cklocation.o: cklocation.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h register.h ck.h qd.h stats.h ckfutures.h ckIgetControl.h \
-  CkLocation.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h register.h ck.h qd.h stats.h ckfutures.h \
+  ckIgetControl.h CkLocation.def.h
        $(CHARMC) -c -I. cklocation.C
 
 ckarray.o: ckarray.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h register.h ck.h qd.h stats.h ckfutures.h ckIgetControl.h \
-  pathHistory.h PathHistory.decl.h pup_stl.h pup.h CkArray.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h register.h ck.h qd.h stats.h ckfutures.h \
+  ckIgetControl.h pathHistory.h PathHistory.decl.h pup_stl.h pup.h \
+  CkArray.def.h
        $(CHARMC) -c -I. ckarray.C
 
 ckreduction.o: ckreduction.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h ck.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h CkReduction.def.h
+       $(CHARMC) -c -I. ckreduction.C
+
+ckarrayreductionmgr.o: ckarrayreductionmgr.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
@@ -683,17 +688,16 @@ ckreduction.o: ckreduction.C charm++.h charm.h converse.h conv-config.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
   envelope.h ck.h qd.h register.h stats.h ckfutures.h ckIgetControl.h \
-  CkReduction.def.h
-       $(CHARMC) -c -I. ckreduction.C
+  CkArrayReductionMgr.def.h
+       $(CHARMC) -c -I. ckarrayreductionmgr.C
 
-ckarrayreductionmgr.o: ckarrayreductionmgr.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+tempo.o: tempo.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -701,70 +705,51 @@ ckarrayreductionmgr.o: ckarrayreductionmgr.C charm++.h charm.h converse.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h ck.h qd.h register.h stats.h ckfutures.h \
-  ckIgetControl.h CkArrayReductionMgr.def.h
-       $(CHARMC) -c -I. ckarrayreductionmgr.C
+  trace-bluegene.h envelope.h tempo.def.h
+       $(CHARMC) -c -I. tempo.C
 
-tempo.o: tempo.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+waitqd.o: waitqd.C waitqd.h charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
+  ckarrayreductionmgr.h trace.h trace-bluegene.h envelope.h waitqd.decl.h \
+  waitqd.def.h
+       $(CHARMC) -c -I. waitqd.C
+
+LBDatabase.o: LBDatabase.C converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h LBDatabase.h lbdb.h charm.h pup.h middle.h \
+  middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h \
   ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
   cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
   ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h tempo.def.h
-       $(CHARMC) -c -I. tempo.C
-
-waitqd.o: waitqd.C waitqd.h charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h sdag.h \
-  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
-  trace.h trace-bluegene.h envelope.h waitqd.decl.h waitqd.def.h
-       $(CHARMC) -c -I. waitqd.C
-
-LBDatabase.o: LBDatabase.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h LBDatabase.h lbdb.h charm.h \
-  pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h \
-  LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
-  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
-  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
-  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
-  trace.h trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h \
-  LBSimulation.h charm++.h CentralLB.h BaseLB.h CentralLB.decl.h \
-  CentralLBMsg.h topology.h NullLB.h BaseLB.h LBDatabase.def.h
+  envelope.h NullLB.decl.h BaseLB.decl.h LBSimulation.h charm++.h \
+  CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h topology.h \
+  NullLB.h BaseLB.h LBDatabase.def.h
        $(CHARMC) -c -I. LBDatabase.C
 
 lbdb.o: lbdb.C converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h \
-  conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h lbdb.h converse.h charm.h pup.h \
-  middle.h middle-conv.h LBObj.h LBOM.h LBDatabase.h LBDBManager.h \
-  cklists.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
+  conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h converse.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h lbdb.h converse.h charm.h pup.h middle.h \
+  middle-conv.h LBObj.h LBOM.h LBDatabase.h LBDBManager.h cklists.h \
+  LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
   ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
   debug-conv.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
   conv-ccs.h sockRoutines.h conv-config.h ccs-server.h ckobjQ.h \
@@ -778,87 +763,83 @@ lbdb.o: lbdb.C converse.h conv-config.h conv-autoconfig.h conv-common.h \
        $(CHARMC) -c -I. lbdb.C
 
 lbdbf.o: lbdbf.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h charm-api.h
-       $(CHARMC) -c -I. lbdbf.C
-
-charisma.o: charisma.C charisma.h charisma.decl.h charm++.h charm.h \
-  converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
   LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h tempo.h tempo.decl.h waitqd.h \
-  waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h \
-  ckarrayreductionmgr.h trace.h trace-bluegene.h envelope.h \
-  charisma.def.h
-       $(CHARMC) -c -I. charisma.C
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h charm-api.h
+       $(CHARMC) -c -I. lbdbf.C
 
-ckobjQ.o: ckobjQ.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+charisma.o: charisma.C charisma.h charisma.decl.h charm++.h charm.h \
+  converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
   NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h
+  CkFutures.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
+  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
+  trace.h trace-bluegene.h envelope.h charisma.def.h
+       $(CHARMC) -c -I. charisma.C
+
+ckobjQ.o: ckobjQ.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h
        $(CHARMC) -c -I. ckobjQ.C
 
 LBAgent.o: LBAgent.C LBAgent.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h charm.h pup.h middle.h middle-conv.h \
-  LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h \
-  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h \
-  topology.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
+  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
+  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
+  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
+  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
+  trace.h trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h \
+  CentralLB.decl.h CentralLBMsg.h topology.h
        $(CHARMC) -c -I. LBAgent.C
 
 LBProfit.o: LBProfit.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h LBProfit.h BaseLB.h LBDatabase.h \
-  lbdb.h charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  charm++.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h LBProfit.h BaseLB.h LBDatabase.h lbdb.h \
+  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
   CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
@@ -868,32 +849,12 @@ LBProfit.o: LBProfit.C converse.h conv-config.h conv-autoconfig.h \
        $(CHARMC) -c -I. LBProfit.C
 
 ckcheckpoint.o: ckcheckpoint.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h ck.h qd.h register.h stats.h ckfutures.h ckIgetControl.h \
-  CkCheckpoint.def.h
-       $(CHARMC) -c -I. ckcheckpoint.C
-
-ckmemcheckpoint.o: ckmemcheckpoint.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -901,18 +862,18 @@ ckmemcheckpoint.o: ckmemcheckpoint.C charm++.h charm.h converse.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h ck.h qd.h register.h stats.h ckfutures.h \
-  ckIgetControl.h CkMemCheckpoint.def.h
-       $(CHARMC) -c -I. ckmemcheckpoint.C
-
-ckevacuation.o: ckevacuation.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  trace-bluegene.h envelope.h ck.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h CkCheckpoint.def.h
+       $(CHARMC) -c -I. ckcheckpoint.C
+
+ckmemcheckpoint.o: ckmemcheckpoint.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
@@ -920,17 +881,17 @@ ckevacuation.o: ckevacuation.C charm++.h charm.h converse.h conv-config.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h ck.h qd.h register.h stats.h ckfutures.h ckIgetControl.h
-       $(CHARMC) -c -I. ckevacuation.C
+  envelope.h ck.h qd.h register.h stats.h ckfutures.h ckIgetControl.h \
+  CkMemCheckpoint.def.h
+       $(CHARMC) -c -I. ckmemcheckpoint.C
 
-ckmessagelogging.o: ckmessagelogging.C charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h ck.h charm++.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+ckevacuation.o: ckevacuation.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -938,19 +899,36 @@ ckmessagelogging.o: ckmessagelogging.C charm.h converse.h conv-config.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
+  trace-bluegene.h envelope.h ck.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h
+       $(CHARMC) -c -I. ckevacuation.C
+
+ckmessagelogging.o: ckmessagelogging.C charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h ck.h charm++.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
+  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
+  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
+  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
+  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h lbdb++.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
+  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
+  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
+  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
+  trace.h trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
   ckIgetControl.h ckmessagelogging.h ckobjid.h CentralLB.h BaseLB.h \
   CentralLB.decl.h CentralLBMsg.h
        $(CHARMC) -c -I. ckmessagelogging.C
 
 LBDBManager.o: LBDBManager.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -962,20 +940,19 @@ LBDBManager.o: LBDBManager.C charm++.h charm.h converse.h conv-config.h \
        $(CHARMC) -c -I. LBDBManager.C
 
 LBComm.o: LBComm.C converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h \
-  conv-lists.h conv-trace.h persistent.h debug-conv.h LBComm.h converse.h \
-  lbdb.h charm.h pup.h middle.h middle-conv.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  converse.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h LBComm.h converse.h lbdb.h \
+  charm.h pup.h middle.h middle-conv.h
        $(CHARMC) -c -I. LBComm.C
 
 LBObj.o: LBObj.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -988,48 +965,27 @@ LBObj.o: LBObj.C charm++.h charm.h converse.h conv-config.h \
 
 LBMachineUtil.o: LBMachineUtil.C LBDatabase.h lbdb.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h charm.h pup.h middle.h middle-conv.h \
-  LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h \
-  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h NullLB.decl.h BaseLB.decl.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
+  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
+  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
+  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
+  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
+  trace.h trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h
        $(CHARMC) -c -I. LBMachineUtil.C
 
 CentralPredictor.o: CentralPredictor.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h CentralLB.h BaseLB.h LBDatabase.h \
-  CentralLB.decl.h charm++.h BaseLB.decl.h LBDatabase.decl.h \
-  CentralLBMsg.h
-       $(CHARMC) -c -I. CentralPredictor.C
-
-BaseLB.o: BaseLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h charm++.h \
   cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
   ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
@@ -1039,18 +995,35 @@ BaseLB.o: BaseLB.C charm++.h charm.h converse.h conv-config.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h BaseLB.h LBSimulation.h charm++.h CentralLB.h \
-  CentralLB.decl.h CentralLBMsg.h BaseLB.def.h
+  envelope.h CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
+  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h
+       $(CHARMC) -c -I. CentralPredictor.C
+
+BaseLB.o: BaseLB.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h BaseLB.h LBSimulation.h charm++.h \
+  CentralLB.h CentralLB.decl.h CentralLBMsg.h BaseLB.def.h
        $(CHARMC) -c -I. BaseLB.C
 
 CentralLB.o: CentralLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1066,99 +1039,96 @@ CentralLB.o: CentralLB.C charm++.h charm.h converse.h conv-config.h \
        $(CHARMC) -c -I. CentralLB.C
 
 HybridBaseLB.o: HybridBaseLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h BaseLB.h HybridBaseLB.h CentralLB.h CentralLB.decl.h \
-  CentralLBMsg.h HybridBaseLB.decl.h NeighborLBMsg.h HybridLBMsg.h \
-  topology.h GreedyLB.h GreedyLB.decl.h GreedyCommLB.h \
-  GreedyCommLB.decl.h elements.h Set.h CommLBHeap.h RefineCommLB.h \
-  RefinerComm.h Refiner.h RefineLB.h RefineLB.decl.h RefineCommLB.decl.h \
-  HybridBaseLB.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h BaseLB.h HybridBaseLB.h CentralLB.h \
+  CentralLB.decl.h CentralLBMsg.h HybridBaseLB.decl.h NeighborLBMsg.h \
+  HybridLBMsg.h topology.h GreedyLB.h GreedyLB.decl.h GreedyCommLB.h \
+  GreedyCommLB.decl.h elements.h ckset.h ckheap.h CommLBHeap.h \
+  RefineCommLB.h RefinerComm.h Refiner.h RefineLB.h RefineLB.decl.h \
+  RefineCommLB.decl.h HybridBaseLB.def.h
        $(CHARMC) -c -I. HybridBaseLB.C
 
 NborBaseLB.o: NborBaseLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h BaseLB.h NborBaseLB.h NborBaseLB.decl.h NeighborLBMsg.h \
-  topology.h NborBaseLB.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h BaseLB.h NborBaseLB.h NborBaseLB.decl.h \
+  NeighborLBMsg.h topology.h NborBaseLB.def.h
        $(CHARMC) -c -I. NborBaseLB.C
 
 WSLB.o: WSLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h BaseLB.h LBDatabase.h cklists.h WSLB.h BaseLB.h WSLB.decl.h \
-  topology.h WSLB.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h BaseLB.h LBDatabase.h cklists.h ckheap.h \
+  elements.h ckset.h WSLB.h BaseLB.h WSLB.decl.h topology.h WSLB.def.h
        $(CHARMC) -c -I. WSLB.C
 
 ObjGraph.o: ObjGraph.C ObjGraph.h lbdb.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h charm.h pup.h middle.h middle-conv.h CentralLB.h BaseLB.h \
-  LBDatabase.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h charm.h pup.h middle.h \
+  middle-conv.h CentralLB.h BaseLB.h LBDatabase.h LBDBManager.h cklists.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  charm++.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
+  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
+  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
+  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
+  trace.h trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h \
+  CentralLB.decl.h CentralLBMsg.h
        $(CHARMC) -c -I. ObjGraph.C
 
 graph.o: graph.c converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h \
-  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h graph.h
+  conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
+  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
+  debug-conv.h graph.h
        $(CHARMC) -c -I. graph.c
 
 LButil.o: LButil.C elements.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h lbdb.h charm.h pup.h middle.h \
-  middle-conv.h Set.h cklists.h BaseLB.h LBDatabase.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  charm++.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h lbdb.h charm.h pup.h middle.h middle-conv.h \
+  ckset.h cklists.h ckheap.h BaseLB.h LBDatabase.h LBDBManager.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
   CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
@@ -1169,100 +1139,102 @@ LButil.o: LButil.C elements.h converse.h conv-config.h conv-autoconfig.h \
 
 Refiner.o: Refiner.C Refiner.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h charm.h pup.h middle.h middle-conv.h \
-  LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h \
-  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h \
-  elements.h Set.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
+  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
+  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
+  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
+  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
+  trace.h trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h \
+  CentralLB.decl.h CentralLBMsg.h elements.h ckset.h ckheap.h
        $(CHARMC) -c -I. Refiner.C
 
 RefinerApprox.o: RefinerApprox.C RefinerApprox.h CentralLB.h BaseLB.h \
   LBDatabase.h lbdb.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h charm.h pup.h middle.h \
-  middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h charm.h pup.h middle.h middle-conv.h \
+  LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
   envelope.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h \
-  Refiner.h elements.h Set.h
+  Refiner.h elements.h ckset.h ckheap.h
        $(CHARMC) -c -I. RefinerApprox.C
 
 RefinerComm.o: RefinerComm.C RefinerComm.h CentralLB.h BaseLB.h \
   LBDatabase.h lbdb.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h charm.h pup.h middle.h \
-  middle-conv.h LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h \
-  LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h charm.h pup.h middle.h middle-conv.h \
+  LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
+  lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
   envelope.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h \
-  elements.h Set.h Refiner.h
+  elements.h ckset.h ckheap.h Refiner.h
        $(CHARMC) -c -I. RefinerComm.C
 
 bitvecset.o: bitvecset.c bitvecset.h
        $(CHARMC) -c -I. bitvecset.c
 
-Set.o: Set.C Set.h elements.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
+ckset.o: ckset.C ckset.h elements.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
   conv-trace.h persistent.h debug-conv.h lbdb.h charm.h pup.h middle.h \
   middle-conv.h cklists.h
-       $(CHARMC) -c -I. Set.C
+       $(CHARMC) -c -I. ckset.C
 
-ckheap.o: ckheap.C
+ckheap.o: ckheap.C ckheap.h elements.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h lbdb.h charm.h pup.h middle.h \
+  middle-conv.h ckset.h cklists.h
        $(CHARMC) -c -I. ckheap.C
 
 CommLBHeap.o: CommLBHeap.C CommLBHeap.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h
        $(CHARMC) -c -I. CommLBHeap.C
 
 NullLB.o: NullLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1277,32 +1249,31 @@ NullLB.o: NullLB.C charm++.h charm.h converse.h conv-config.h \
 
 LBSimulation.o: LBSimulation.C LBSimulation.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h CentralLB.h BaseLB.h LBDatabase.h \
-  CentralLB.decl.h charm++.h BaseLB.decl.h LBDatabase.decl.h \
-  CentralLBMsg.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h charm++.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h CentralLB.h BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h \
+  BaseLB.decl.h LBDatabase.decl.h CentralLBMsg.h
        $(CHARMC) -c -I. LBSimulation.C
 
 ComlibModuleInterface.o: ComlibModuleInterface.C ComlibStrategy.h \
   charm++.h charm.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1314,33 +1285,32 @@ ComlibModuleInterface.o: ComlibModuleInterface.C ComlibStrategy.h \
        $(CHARMC) -c -I. ComlibModuleInterface.C
 
 charmProjections.o: charmProjections.C converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h charmProjections.h traceCoreCommon.h charmEvents.h \
-  traceCoreAPI.h ck.h charm++.h charm.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h qd.h register.h stats.h ckfutures.h \
-  ckIgetControl.h trace-common.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h charmProjections.h \
+  traceCoreCommon.h charmEvents.h traceCoreAPI.h ck.h charm++.h charm.h \
+  pup.h middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h qd.h register.h stats.h ckfutures.h ckIgetControl.h \
+  trace-common.h
        $(CHARMC) -c -I. charmProjections.C
 
 pathHistory.o: pathHistory.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1354,13 +1324,12 @@ pathHistory.o: pathHistory.C charm++.h charm.h converse.h conv-config.h \
        $(CHARMC) -c -I. pathHistory.C
 
 EveryLB.o: EveryLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1383,13 +1352,12 @@ EveryLB.o: EveryLB.C charm++.h charm.h converse.h conv-config.h \
        $(CHARMC) -c -I. EveryLB.C
 
 DummyLB.o: DummyLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1403,13 +1371,12 @@ DummyLB.o: DummyLB.C charm++.h charm.h converse.h conv-config.h \
        $(CHARMC) -c -I. DummyLB.C
 
 ComboCentLB.o: ComboCentLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1423,13 +1390,12 @@ ComboCentLB.o: ComboCentLB.C charm++.h charm.h converse.h conv-config.h \
        $(CHARMC) -c -I. ComboCentLB.C
 
 RandCentLB.o: RandCentLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1443,13 +1409,12 @@ RandCentLB.o: RandCentLB.C charm++.h charm.h converse.h conv-config.h \
        $(CHARMC) -c -I. RandCentLB.C
 
 RefineLB.o: RefineLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1459,18 +1424,17 @@ RefineLB.o: RefineLB.C charm++.h charm.h converse.h conv-config.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
   trace-bluegene.h envelope.h cklists.h RefineLB.h CentralLB.h BaseLB.h \
   LBDatabase.h CentralLB.decl.h charm++.h BaseLB.decl.h LBDatabase.decl.h \
-  CentralLBMsg.h Refiner.h elements.h converse.h lbdb.h Set.h \
+  CentralLBMsg.h Refiner.h elements.h converse.h lbdb.h ckset.h ckheap.h \
   RefineLB.decl.h RefineLB.def.h
        $(CHARMC) -c -I. RefineLB.C
 
 RefineKLB.o: RefineKLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1481,17 +1445,16 @@ RefineKLB.o: RefineKLB.C charm++.h charm.h converse.h conv-config.h \
   trace-bluegene.h envelope.h cklists.h RefineKLB.h CentralLB.h BaseLB.h \
   LBDatabase.h CentralLB.decl.h charm++.h BaseLB.decl.h LBDatabase.decl.h \
   CentralLBMsg.h RefinerApprox.h Refiner.h elements.h converse.h lbdb.h \
-  Set.h RefineKLB.decl.h RefineKLB.def.h
+  ckset.h ckheap.h RefineKLB.decl.h RefineKLB.def.h
        $(CHARMC) -c -I. RefineKLB.C
 
 RefineCommLB.o: RefineCommLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1502,37 +1465,35 @@ RefineCommLB.o: RefineCommLB.C charm++.h charm.h converse.h conv-config.h \
   trace-bluegene.h envelope.h cklists.h RefineCommLB.h CentralLB.h \
   BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h BaseLB.decl.h \
   LBDatabase.decl.h CentralLBMsg.h RefinerComm.h elements.h converse.h \
-  lbdb.h Set.h Refiner.h RefineLB.h RefineLB.decl.h RefineCommLB.decl.h \
-  RefineCommLB.def.h
+  lbdb.h ckset.h ckheap.h Refiner.h RefineLB.h RefineLB.decl.h \
+  RefineCommLB.decl.h RefineCommLB.def.h
        $(CHARMC) -c -I. RefineCommLB.C
 
 GreedyLB.o: GreedyLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h GreedyLB.h CentralLB.h BaseLB.h CentralLB.decl.h \
-  CentralLBMsg.h GreedyLB.decl.h GreedyLB.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h GreedyLB.h CentralLB.h BaseLB.h \
+  CentralLB.decl.h CentralLBMsg.h GreedyLB.decl.h GreedyLB.def.h
        $(CHARMC) -c -I. GreedyLB.C
 
 GreedyCommLB.o: GreedyCommLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1543,135 +1504,133 @@ GreedyCommLB.o: GreedyCommLB.C charm++.h charm.h converse.h conv-config.h \
   trace-bluegene.h envelope.h cklists.h GreedyCommLB.h CentralLB.h \
   BaseLB.h LBDatabase.h CentralLB.decl.h charm++.h BaseLB.decl.h \
   LBDatabase.decl.h CentralLBMsg.h GreedyCommLB.decl.h elements.h \
-  converse.h lbdb.h Set.h CommLBHeap.h manager.h GreedyCommLB.def.h
+  converse.h lbdb.h ckset.h ckheap.h CommLBHeap.h manager.h \
+  GreedyCommLB.def.h
        $(CHARMC) -c -I. GreedyCommLB.C
 
 GreedyAgentLB.o: GreedyAgentLB.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h LBSimulation.h CentralLB.h BaseLB.h \
-  CentralLB.decl.h CentralLBMsg.h cklists.h GreedyAgentLB.h CentralLB.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h charm++.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h LBSimulation.h CentralLB.h BaseLB.h CentralLB.decl.h \
+  CentralLBMsg.h cklists.h GreedyAgentLB.h CentralLB.h \
   GreedyAgentLB.decl.h charm++.h CentralLB.decl.h LBAgent.h topology.h \
   GreedyAgentLB.def.h
        $(CHARMC) -c -I. GreedyAgentLB.C
 
 GridCommLB.o: GridCommLB.C GridCommLB.decl.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h CentralLB.decl.h CentralLBMsg.h \
-  GridCommLB.h CentralLB.h BaseLB.h manager.h GridCommLB.def.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h CentralLB.decl.h CentralLBMsg.h GridCommLB.h CentralLB.h \
+  BaseLB.h manager.h GridCommLB.def.h
        $(CHARMC) -c -I. GridCommLB.C
 
 GridCommRefineLB.o: GridCommRefineLB.C GridCommRefineLB.decl.h charm++.h \
   charm.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h \
-  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h CentralLB.decl.h CentralLBMsg.h \
-  GridCommRefineLB.h CentralLB.h BaseLB.h manager.h \
-  GridCommRefineLB.def.h
+  conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
+  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
+  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h CentralLB.decl.h CentralLBMsg.h GridCommRefineLB.h \
+  CentralLB.h BaseLB.h manager.h GridCommRefineLB.def.h
        $(CHARMC) -c -I. GridCommRefineLB.C
 
 GridMetisLB.o: GridMetisLB.C GridMetisLB.decl.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h CentralLB.decl.h CentralLBMsg.h \
-  GridMetisLB.h CentralLB.h BaseLB.h manager.h GridMetisLB.def.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h CentralLB.decl.h CentralLBMsg.h GridMetisLB.h CentralLB.h \
+  BaseLB.h manager.h GridMetisLB.def.h
        $(CHARMC) -c -I. GridMetisLB.C
 
 GridHybridLB.o: GridHybridLB.C GridHybridLB.decl.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h CentralLB.decl.h CentralLBMsg.h \
-  GridHybridLB.h CentralLB.h BaseLB.h manager.h GridHybridLB.def.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h CentralLB.decl.h CentralLBMsg.h GridHybridLB.h CentralLB.h \
+  BaseLB.h manager.h GridHybridLB.def.h
        $(CHARMC) -c -I. GridHybridLB.C
 
 GridHybridSeedLB.o: GridHybridSeedLB.C GridHybridSeedLB.decl.h charm++.h \
   charm.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h \
-  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
-  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h CentralLB.decl.h CentralLBMsg.h \
-  GridHybridSeedLB.h CentralLB.h BaseLB.h manager.h \
-  GridHybridSeedLB.def.h
-       $(CHARMC) -c -I. GridHybridSeedLB.C
-
-Comm1LB.o: Comm1LB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
+  conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
   conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
   debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
   ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h CentralLB.decl.h CentralLBMsg.h GridHybridSeedLB.h \
+  CentralLB.h BaseLB.h manager.h GridHybridSeedLB.def.h
+       $(CHARMC) -c -I. GridHybridSeedLB.C
+
+Comm1LB.o: Comm1LB.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1682,17 +1641,17 @@ Comm1LB.o: Comm1LB.C charm++.h charm.h converse.h conv-config.h \
   trace-bluegene.h envelope.h cklists.h Comm1LB.h CentralLB.h BaseLB.h \
   CentralLB.decl.h CentralLBMsg.h Comm1LB.decl.h charm++.h \
   CentralLB.decl.h CommLBHeap.h GreedyCommLB.h CentralLB.h \
-  GreedyCommLB.decl.h elements.h converse.h lbdb.h Set.h Comm1LB.def.h
+  GreedyCommLB.decl.h elements.h converse.h lbdb.h ckset.h ckheap.h \
+  Comm1LB.def.h
        $(CHARMC) -c -I. Comm1LB.C
 
 OrbLB.o: OrbLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1707,33 +1666,32 @@ OrbLB.o: OrbLB.C charm++.h charm.h converse.h conv-config.h \
 
 RecBisectBfLB.o: RecBisectBfLB.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h RecBisectBfLB.h CentralLB.h BaseLB.h \
-  LBDatabase.h CentralLB.decl.h charm++.h BaseLB.decl.h LBDatabase.decl.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h charm++.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h RecBisectBfLB.h CentralLB.h BaseLB.h LBDatabase.h \
+  CentralLB.decl.h charm++.h BaseLB.decl.h LBDatabase.decl.h \
   CentralLBMsg.h RecBisectBfLB.decl.h ObjGraph.h lbdb.h graph.h \
   bitvecset.h cklists.h RecBisectBfLB.def.h
        $(CHARMC) -c -I. RecBisectBfLB.C
 
 MetisLB.o: MetisLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1748,30 +1706,10 @@ MetisLB.o: MetisLB.C charm++.h charm.h converse.h conv-config.h \
 
 PhasebyArrayLB.o: PhasebyArrayLB.C charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h PhasebyArrayLB.h CentralLB.h BaseLB.h \
-  LBDatabase.h CentralLB.decl.h charm++.h BaseLB.decl.h LBDatabase.decl.h \
-  CentralLBMsg.h PhasebyArrayLB.decl.h PhasebyArrayLB.def.h
-       $(CHARMC) -c -I. PhasebyArrayLB.C
-
-RotateLB.o: RotateLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h charm++.h \
   cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
   ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
@@ -1781,18 +1719,18 @@ RotateLB.o: RotateLB.C charm++.h charm.h converse.h conv-config.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h RotateLB.decl.h CentralLB.decl.h CentralLBMsg.h RotateLB.h \
-  CentralLB.h BaseLB.h RotateLB.def.h
-       $(CHARMC) -c -I. RotateLB.C
+  envelope.h PhasebyArrayLB.h CentralLB.h BaseLB.h LBDatabase.h \
+  CentralLB.decl.h charm++.h BaseLB.decl.h LBDatabase.decl.h \
+  CentralLBMsg.h PhasebyArrayLB.decl.h PhasebyArrayLB.def.h
+       $(CHARMC) -c -I. PhasebyArrayLB.C
 
-NeighborLB.o: NeighborLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  charm++.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+RotateLB.o: RotateLB.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -1800,19 +1738,16 @@ NeighborLB.o: NeighborLB.C charm++.h charm.h converse.h conv-config.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h cklists.h NeighborLB.h NborBaseLB.h \
-  BaseLB.h LBDatabase.h NborBaseLB.decl.h charm++.h LBDatabase.decl.h \
-  BaseLB.decl.h NeighborLBMsg.h topology.h NeighborLB.decl.h \
-  NeighborLB.def.h
-       $(CHARMC) -c -I. NeighborLB.C
+  trace-bluegene.h envelope.h RotateLB.decl.h CentralLB.decl.h \
+  CentralLBMsg.h RotateLB.h CentralLB.h BaseLB.h RotateLB.def.h
+       $(CHARMC) -c -I. RotateLB.C
 
-NeighborCommLB.o: NeighborCommLB.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+NeighborLB.o: NeighborLB.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
@@ -1821,18 +1756,18 @@ NeighborCommLB.o: NeighborCommLB.C charm++.h charm.h converse.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h cklists.h NeighborCommLB.h NborBaseLB.h \
-  BaseLB.h LBDatabase.h NborBaseLB.decl.h charm++.h LBDatabase.decl.h \
-  BaseLB.decl.h NeighborLBMsg.h topology.h NeighborCommLB.decl.h \
-  NeighborCommLB.def.h
-       $(CHARMC) -c -I. NeighborCommLB.C
+  trace-bluegene.h envelope.h cklists.h ckheap.h elements.h converse.h \
+  lbdb.h ckset.h NeighborLB.h NborBaseLB.h BaseLB.h LBDatabase.h \
+  NborBaseLB.decl.h charm++.h LBDatabase.decl.h BaseLB.decl.h \
+  NeighborLBMsg.h topology.h NeighborLB.decl.h NeighborLB.def.h
+       $(CHARMC) -c -I. NeighborLB.C
 
-TopoLB.o: TopoLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
+NeighborCommLB.o: NeighborCommLB.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h charm++.h \
   cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
   ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
@@ -1842,250 +1777,259 @@ TopoLB.o: TopoLB.C charm++.h charm.h converse.h conv-config.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h \
-  TopoLB.decl.h TopoLB.h topology.h TopoLB.def.h
+  envelope.h cklists.h ckheap.h elements.h converse.h lbdb.h ckset.h \
+  NeighborCommLB.h NborBaseLB.h BaseLB.h LBDatabase.h NborBaseLB.decl.h \
+  charm++.h LBDatabase.decl.h BaseLB.decl.h NeighborLBMsg.h topology.h \
+  NeighborCommLB.decl.h NeighborCommLB.def.h
+       $(CHARMC) -c -I. NeighborCommLB.C
+
+TopoLB.o: TopoLB.C charm++.h charm.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h CentralLB.h BaseLB.h CentralLB.decl.h \
+  CentralLBMsg.h TopoLB.decl.h TopoLB.h topology.h TopoLB.def.h
        $(CHARMC) -c -I. TopoLB.C
 
 RefineTopoLB.o: RefineTopoLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h \
-  RefineTopoLB.decl.h RefineTopoLB.h TopoLB.h topology.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h CentralLB.h BaseLB.h CentralLB.decl.h \
+  CentralLBMsg.h RefineTopoLB.decl.h RefineTopoLB.h TopoLB.h topology.h \
   RefineTopoLB.def.h
        $(CHARMC) -c -I. RefineTopoLB.C
 
 TopoCentLB.o: TopoCentLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h CentralLB.h BaseLB.h CentralLB.decl.h CentralLBMsg.h \
-  TopoCentLB.decl.h TopoCentLB.h topology.h TopoCentLB.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h CentralLB.h BaseLB.h CentralLB.decl.h \
+  CentralLBMsg.h TopoCentLB.decl.h TopoCentLB.h topology.h \
+  TopoCentLB.def.h
        $(CHARMC) -c -I. TopoCentLB.C
 
 HybridLB.o: HybridLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h HybridLB.h BaseLB.h CentralLB.h CentralLB.decl.h \
-  CentralLBMsg.h HybridBaseLB.h HybridBaseLB.decl.h NeighborLBMsg.h \
-  HybridLBMsg.h topology.h HybridLB.decl.h GreedyLB.h GreedyLB.decl.h \
-  GreedyCommLB.h GreedyCommLB.decl.h elements.h Set.h CommLBHeap.h \
-  RefineCommLB.h RefinerComm.h Refiner.h RefineLB.h RefineLB.decl.h \
-  RefineCommLB.decl.h MetisLB.h MetisLB.decl.h HybridLB.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h HybridLB.h BaseLB.h CentralLB.h \
+  CentralLB.decl.h CentralLBMsg.h HybridBaseLB.h HybridBaseLB.decl.h \
+  NeighborLBMsg.h HybridLBMsg.h topology.h HybridLB.decl.h GreedyLB.h \
+  GreedyLB.decl.h GreedyCommLB.h GreedyCommLB.decl.h elements.h ckset.h \
+  ckheap.h CommLBHeap.h RefineCommLB.h RefinerComm.h Refiner.h RefineLB.h \
+  RefineLB.decl.h RefineCommLB.decl.h MetisLB.h MetisLB.decl.h \
+  HybridLB.def.h
        $(CHARMC) -c -I. HybridLB.C
 
 HbmLB.o: HbmLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h BaseLB.h HbmLB.h CentralLB.h CentralLB.decl.h CentralLBMsg.h \
-  HbmLB.decl.h NeighborLBMsg.h HybridLBMsg.h topology.h GreedyLB.h \
-  GreedyLB.decl.h GreedyCommLB.h GreedyCommLB.decl.h elements.h Set.h \
-  CommLBHeap.h RefineCommLB.h RefinerComm.h Refiner.h RefineLB.h \
-  RefineLB.decl.h RefineCommLB.decl.h HbmLB.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h BaseLB.h HbmLB.h CentralLB.h \
+  CentralLB.decl.h CentralLBMsg.h HbmLB.decl.h NeighborLBMsg.h \
+  HybridLBMsg.h topology.h GreedyLB.h GreedyLB.decl.h GreedyCommLB.h \
+  GreedyCommLB.decl.h elements.h ckset.h ckheap.h CommLBHeap.h \
+  RefineCommLB.h RefinerComm.h Refiner.h RefineLB.h RefineLB.decl.h \
+  RefineCommLB.decl.h HbmLB.def.h
        $(CHARMC) -c -I. HbmLB.C
 
 BlockLB.o: BlockLB.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h BlockLB.decl.h CentralLB.decl.h CentralLBMsg.h BlockLB.h \
-  CentralLB.h BaseLB.h BlockLB.def.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h BlockLB.decl.h CentralLB.decl.h \
+  CentralLBMsg.h BlockLB.h CentralLB.h BaseLB.h BlockLB.def.h
        $(CHARMC) -c -I. BlockLB.C
 
 manager.o: manager.C manager.h CentralLB.h BaseLB.h LBDatabase.h lbdb.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h charm.h pup.h middle.h middle-conv.h \
-  LBDBManager.h cklists.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h \
-  lbdb++.h LBDatabase.decl.h charm++.h ckbitvector.h ckstream.h init.h \
-  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h NullLB.decl.h BaseLB.decl.h CentralLB.decl.h CentralLBMsg.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
+  charm.h pup.h middle.h middle-conv.h LBDBManager.h cklists.h LBObj.h \
+  LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h charm++.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h \
+  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
+  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
+  ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
+  trace.h trace-bluegene.h envelope.h NullLB.decl.h BaseLB.decl.h \
+  CentralLB.decl.h CentralLBMsg.h
        $(CHARMC) -c -I. manager.C
 
 blue.o: blue.C cklists.h pup.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h blue.h blue-conv.h blue_impl.h \
-  ckliststring.h blue_types.h bigsim_timing.h bigsim_logs.h blue_defs.h \
-  bigsim_network.h bigsim_record.h bigsim_ooc.h bigsim_debug.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h blue.h blue-conv.h blue_impl.h ckliststring.h \
+  blue_types.h bigsim_timing.h bigsim_logs.h blue_defs.h bigsim_network.h \
+  bigsim_record.h bigsim_ooc.h bigsim_debug.h
        $(CHARMC) -c -I. blue.C
 
 bigsim_node.o: bigsim_node.C blue.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h blue-conv.h blue_impl.h ckliststring.h blue_types.h \
-  bigsim_timing.h cklists.h pup.h bigsim_logs.h blue_defs.h \
-  bigsim_network.h bigsim_debug.h bigsim_ooc.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
+  ckliststring.h blue_types.h bigsim_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h bigsim_network.h bigsim_debug.h bigsim_ooc.h
        $(CHARMC) -c -I. bigsim_node.C
 
 bigsim_proc.o: bigsim_proc.C blue.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h blue-conv.h blue_impl.h ckliststring.h blue_types.h \
-  bigsim_timing.h cklists.h pup.h bigsim_logs.h blue_defs.h \
-  bigsim_network.h bigsim_record.h ckcheckpoint.h CkCheckpoint.decl.h \
-  charm++.h charm.h middle.h middle-conv.h ckbitvector.h ckstream.h \
-  init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckevacuation.h ckarrayreductionmgr.h \
-  trace.h trace-bluegene.h envelope.h bigsim_ooc.h bigsim_debug.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
+  ckliststring.h blue_types.h bigsim_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h bigsim_network.h bigsim_record.h \
+  ckcheckpoint.h CkCheckpoint.decl.h charm++.h charm.h middle.h \
+  middle-conv.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
+  conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h \
+  CkReduction.decl.h cknodegroupreduction.h CkArrayReductionMgr.decl.h \
+  ckmemcheckpoint.h CkMemCheckpoint.decl.h readonly.h ckarray.h \
+  cklocation.h LBDatabase.h lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h \
+  LBMachineUtil.h lbdb++.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h \
+  CkLocation.decl.h CkArray.decl.h CkFutures.decl.h charisma.h \
+  charisma.decl.h tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h bigsim_ooc.h bigsim_debug.h
        $(CHARMC) -c -I. bigsim_proc.C
 
 bigsim_init.o: bigsim_init.C bigsim_debug.h queueing.h blue.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h blue-conv.h blue_impl.h ckliststring.h blue_types.h \
-  bigsim_timing.h cklists.h pup.h bigsim_logs.h blue_defs.h \
-  bigsim_network.h bigsim_ooc.h
+  conv-mach-opt.h pup_c.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h debug-conv.h blue-conv.h \
+  blue_impl.h ckliststring.h blue_types.h bigsim_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h bigsim_network.h bigsim_ooc.h
        $(CHARMC) -c -I. bigsim_init.C
 
 bigsim_timing.o: bigsim_timing.C blue.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h blue-conv.h blue_impl.h ckliststring.h blue_types.h \
-  bigsim_timing.h cklists.h pup.h bigsim_logs.h blue_defs.h \
-  bigsim_network.h bigsim_ooc.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
+  ckliststring.h blue_types.h bigsim_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h bigsim_network.h bigsim_ooc.h
        $(CHARMC) -c -I. bigsim_timing.C
 
 bigsim_record.o: bigsim_record.C blue.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h blue-conv.h bigsim_record.h blue_impl.h ckliststring.h \
-  blue_types.h bigsim_timing.h cklists.h pup.h bigsim_logs.h blue_defs.h \
-  bigsim_network.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h blue-conv.h bigsim_record.h \
+  blue_impl.h ckliststring.h blue_types.h bigsim_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h bigsim_network.h
        $(CHARMC) -c -I. bigsim_record.C
 
 bigsim_ooc.o: bigsim_ooc.C blue.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h blue-conv.h blue_types.h bigsim_ooc.h blue_impl.h \
-  ckliststring.h bigsim_timing.h cklists.h pup.h bigsim_logs.h \
-  blue_defs.h bigsim_network.h bigsim_debug.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_types.h \
+  bigsim_ooc.h blue_impl.h ckliststring.h bigsim_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h bigsim_network.h bigsim_debug.h
        $(CHARMC) -c -I. bigsim_ooc.C
 
 shared_alloc.o: shared_alloc.C shared-alloc.h
        $(CHARMC) -c -I. shared_alloc.C
 
 bigsim_read.o: bigsim_read.C blue.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h blue-conv.h blue_impl.h ckliststring.h blue_types.h \
-  bigsim_timing.h cklists.h pup.h bigsim_logs.h blue_defs.h \
-  bigsim_network.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
+  ckliststring.h blue_types.h bigsim_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h bigsim_network.h
        $(CHARMC) -c -I. bigsim_read.C
 
 bigsim_logs.o: bigsim_logs.C blue.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h blue-conv.h blue_impl.h ckliststring.h blue_types.h \
-  bigsim_timing.h cklists.h pup.h bigsim_logs.h blue_defs.h \
-  bigsim_network.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
+  ckliststring.h blue_types.h bigsim_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h bigsim_network.h
        $(CHARMC) -c -I. bigsim_logs.C
 
 bigsim_api.o: bigsim_api.C blue.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h blue-conv.h blue_impl.h ckliststring.h blue_types.h \
-  bigsim_timing.h cklists.h pup.h bigsim_logs.h blue_defs.h \
-  bigsim_network.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h blue-conv.h blue_impl.h \
+  ckliststring.h blue_types.h bigsim_timing.h cklists.h pup.h \
+  bigsim_logs.h blue_defs.h bigsim_network.h
        $(CHARMC) -c -I. bigsim_api.C
 
 blue_stub.o: blue_stub.C charm++.h charm.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
-  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
-  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
+  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h
        $(CHARMC) -c -I. blue_stub.C
 
 blue_standalone.o: blue_standalone.C
@@ -2096,9 +2040,9 @@ MPIStrategy.o: MPIStrategy.C
 
 StreamingStrategy.o: StreamingStrategy.C StreamingStrategy.h \
   convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h cklists.h pup_cmialloc.h
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h pup.h cklists.h pup_cmialloc.h
        $(CHARMC) -c -I. StreamingStrategy.C
 
 DummyStrategy.o: DummyStrategy.C
@@ -2110,7 +2054,79 @@ NodeMulticast.o: NodeMulticast.C
 ChunkMulticastStrategy.o: ChunkMulticastStrategy.C \
   ChunkMulticastStrategy.h ComlibManager.h convcomlibmanager.h \
   convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
+  charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
+  ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h \
+  ComlibSectionInfo.h queueing.h ck.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h spanningTreeStrategy.h spanningTreeVertex.h \
+  treeStrategy_topoUnaware.h treeStrategy_nodeAware_minGens.h \
+  treeStrategy_nodeAware_minBytes.h treeStrategy_3dTorus_minHops.h \
+  TopoManager.h treeStrategy_3dTorus_minBytesHops.h
+       $(CHARMC) -c -I. ChunkMulticastStrategy.C
+
+OneTimeMulticastStrategy.o: OneTimeMulticastStrategy.C \
+  OneTimeMulticastStrategy.h ComlibManager.h convcomlibmanager.h \
+  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
+  charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
+  ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h \
+  ComlibSectionInfo.h TopoManager.h spanningTreeStrategy.h \
+  spanningTreeVertex.h treeStrategy_topoUnaware.h \
+  treeStrategy_nodeAware_minGens.h treeStrategy_nodeAware_minBytes.h \
+  treeStrategy_3dTorus_minHops.h treeStrategy_3dTorus_minBytesHops.h
+       $(CHARMC) -c -I. OneTimeMulticastStrategy.C
+
+EachToManyMulticastStrategy.o: EachToManyMulticastStrategy.C \
+  EachToManyMulticastStrategy.h ComlibManager.h convcomlibmanager.h \
+  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
+  charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
+  ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h \
+  routerstrategy.h router.h AAPLearner.h convcomlib.h AAMLearner.h
+       $(CHARMC) -c -I. EachToManyMulticastStrategy.C
+
+ComlibSectionInfo.o: ComlibSectionInfo.C ComlibManager.h \
+  convcomlibmanager.h convcomlibstrategy.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
   conv-trace.h persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h \
   charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
@@ -2126,24 +2142,19 @@ ChunkMulticastStrategy.o: ChunkMulticastStrategy.C \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
   trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
-  ComlibArrayListener.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h \
-  queueing.h ck.h qd.h register.h stats.h ckfutures.h ckIgetControl.h \
-  spanningTreeStrategy.h spanningTreeVertex.h treeStrategy_topoUnaware.h \
-  treeStrategy_nodeAware_minGens.h treeStrategy_nodeAware_minBytes.h \
-  treeStrategy_3dTorus_minHops.h TopoManager.h \
-  treeStrategy_3dTorus_minBytesHops.h
-       $(CHARMC) -c -I. ChunkMulticastStrategy.C
+  ComlibArrayListener.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
+       $(CHARMC) -c -I. ComlibSectionInfo.C
 
-OneTimeMulticastStrategy.o: OneTimeMulticastStrategy.C \
-  OneTimeMulticastStrategy.h ComlibManager.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  debug-conv.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h conv-config.h ccs-server.h ckobjQ.h \
+AAPLearner.o: AAPLearner.C
+       $(CHARMC) -c -I. AAPLearner.C
+
+ComlibStats.o: ComlibStats.C ComlibStats.h charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
   ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
@@ -2151,19 +2162,43 @@ OneTimeMulticastStrategy.o: OneTimeMulticastStrategy.C \
   NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h convcomlibmanager.h convcomlibstrategy.h converse.h pup.h \
+  cklists.h ComlibStrategy.h convcomlibstrategy.h ComlibLearner.h \
+  ComlibManager.h ComlibArrayListener.h comlib.decl.h
+       $(CHARMC) -c -I. ComlibStats.C
+
+AAMLearner.o: AAMLearner.C
+       $(CHARMC) -c -I. AAMLearner.C
+
+MsgPacker.o: MsgPacker.C
+       $(CHARMC) -c -I. MsgPacker.C
+
+MulticastStrategy.o: MulticastStrategy.C MulticastStrategy.h \
+  ComlibManager.h convcomlibmanager.h convcomlibstrategy.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  cklists.h ComlibStrategy.h charm++.h charm.h converse.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h debug-conv.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h conv-config.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
   trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
-  ComlibArrayListener.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h \
-  TopoManager.h spanningTreeStrategy.h spanningTreeVertex.h \
-  treeStrategy_topoUnaware.h treeStrategy_nodeAware_minGens.h \
-  treeStrategy_nodeAware_minBytes.h treeStrategy_3dTorus_minHops.h \
-  treeStrategy_3dTorus_minBytesHops.h
-       $(CHARMC) -c -I. OneTimeMulticastStrategy.C
+  ComlibArrayListener.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
+       $(CHARMC) -c -I. MulticastStrategy.C
 
-EachToManyMulticastStrategy.o: EachToManyMulticastStrategy.C \
-  EachToManyMulticastStrategy.h ComlibManager.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
+DirectMulticastStrategy.o: DirectMulticastStrategy.C \
+  DirectMulticastStrategy.h MulticastStrategy.h ComlibManager.h \
+  convcomlibmanager.h convcomlibstrategy.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
   conv-trace.h persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h \
   charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
@@ -2179,17 +2214,16 @@ EachToManyMulticastStrategy.o: EachToManyMulticastStrategy.C \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
   trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
-  ComlibArrayListener.h ComlibStats.h comlib.decl.h routerstrategy.h \
-  router.h AAPLearner.h convcomlib.h AAMLearner.h
-       $(CHARMC) -c -I. EachToManyMulticastStrategy.C
+  ComlibArrayListener.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
+       $(CHARMC) -c -I. DirectMulticastStrategy.C
 
-ComlibSectionInfo.o: ComlibSectionInfo.C ComlibManager.h \
-  convcomlibmanager.h convcomlibstrategy.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h charm.h \
-  converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+RingMulticastStrategy.o: RingMulticastStrategy.C RingMulticastStrategy.h \
+  MulticastStrategy.h ComlibManager.h convcomlibmanager.h \
+  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
+  charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
   ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
   CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
   conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
@@ -2203,41 +2237,12 @@ ComlibSectionInfo.o: ComlibSectionInfo.C ComlibManager.h \
   conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
   ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h \
   ComlibSectionInfo.h
-       $(CHARMC) -c -I. ComlibSectionInfo.C
-
-AAPLearner.o: AAPLearner.C
-       $(CHARMC) -c -I. AAPLearner.C
-
-ComlibStats.o: ComlibStats.C ComlibStats.h charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h convcomlibmanager.h convcomlibstrategy.h \
-  converse.h pup.h cklists.h ComlibStrategy.h convcomlibstrategy.h \
-  ComlibLearner.h ComlibManager.h ComlibArrayListener.h comlib.decl.h
-       $(CHARMC) -c -I. ComlibStats.C
-
-AAMLearner.o: AAMLearner.C
-       $(CHARMC) -c -I. AAMLearner.C
-
-MsgPacker.o: MsgPacker.C
-       $(CHARMC) -c -I. MsgPacker.C
+       $(CHARMC) -c -I. RingMulticastStrategy.C
 
-MulticastStrategy.o: MulticastStrategy.C MulticastStrategy.h \
-  ComlibManager.h convcomlibmanager.h convcomlibstrategy.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
+MultiRingMulticast.o: MultiRingMulticast.C MultiRingMulticast.h \
+  MulticastStrategy.h ComlibManager.h convcomlibmanager.h \
+  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
   persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
   charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
@@ -2254,35 +2259,33 @@ MulticastStrategy.o: MulticastStrategy.C MulticastStrategy.h \
   conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
   ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h \
   ComlibSectionInfo.h
-       $(CHARMC) -c -I. MulticastStrategy.C
+       $(CHARMC) -c -I. MultiRingMulticast.C
 
-DirectMulticastStrategy.o: DirectMulticastStrategy.C \
-  DirectMulticastStrategy.h MulticastStrategy.h ComlibManager.h \
-  convcomlibmanager.h convcomlibstrategy.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h charm.h \
-  converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
-  ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h \
-  ComlibSectionInfo.h
-       $(CHARMC) -c -I. DirectMulticastStrategy.C
+PipeBroadcastStrategy.o: PipeBroadcastStrategy.C PipeBroadcastStrategy.h \
+  ComlibManager.h convcomlibmanager.h convcomlibstrategy.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  cklists.h ComlibStrategy.h charm++.h charm.h converse.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h debug-conv.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h conv-config.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
+  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
+  ComlibArrayListener.h ComlibStats.h comlib.decl.h \
+  pipebroadcastconverse.h
+       $(CHARMC) -c -I. PipeBroadcastStrategy.C
 
-RingMulticastStrategy.o: RingMulticastStrategy.C RingMulticastStrategy.h \
-  MulticastStrategy.h ComlibManager.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
+MeshStreamingStrategy.o: MeshStreamingStrategy.C MeshStreamingStrategy.h \
+  convcomlibmanager.h convcomlibstrategy.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
   conv-trace.h persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h \
   charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
@@ -2298,13 +2301,12 @@ RingMulticastStrategy.o: RingMulticastStrategy.C RingMulticastStrategy.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
   trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
-  ComlibArrayListener.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
-       $(CHARMC) -c -I. RingMulticastStrategy.C
+  pup_cmialloc.h
+       $(CHARMC) -c -I. MeshStreamingStrategy.C
 
-MultiRingMulticast.o: MultiRingMulticast.C MultiRingMulticast.h \
-  MulticastStrategy.h ComlibManager.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
+PrioStreaming.o: PrioStreaming.C PrioStreaming.h ComlibManager.h \
+  convcomlibmanager.h convcomlibstrategy.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
   queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
   conv-trace.h persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h \
   charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
@@ -2320,78 +2322,54 @@ MultiRingMulticast.o: MultiRingMulticast.C MultiRingMulticast.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
   trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
-  ComlibArrayListener.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
-       $(CHARMC) -c -I. MultiRingMulticast.C
+  ComlibArrayListener.h ComlibStats.h comlib.decl.h StreamingStrategy.h
+       $(CHARMC) -c -I. PrioStreaming.C
 
-PipeBroadcastStrategy.o: PipeBroadcastStrategy.C PipeBroadcastStrategy.h \
+BroadcastStrategy.o: BroadcastStrategy.C BroadcastStrategy.h \
   ComlibManager.h convcomlibmanager.h convcomlibstrategy.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
-  charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
-  ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h \
-  pipebroadcastconverse.h
-       $(CHARMC) -c -I. PipeBroadcastStrategy.C
-
-MeshStreamingStrategy.o: MeshStreamingStrategy.C MeshStreamingStrategy.h \
-  convcomlibmanager.h convcomlibstrategy.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h charm.h \
-  converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
-  ComlibLearner.h pup_cmialloc.h
-       $(CHARMC) -c -I. MeshStreamingStrategy.C
-
-PrioStreaming.o: PrioStreaming.C PrioStreaming.h ComlibManager.h \
-  convcomlibmanager.h convcomlibstrategy.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
-  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
-  debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h charm.h \
-  converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
-  ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h \
-  StreamingStrategy.h
-       $(CHARMC) -c -I. PrioStreaming.C
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  cklists.h ComlibStrategy.h charm++.h charm.h converse.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h debug-conv.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h conv-config.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
+  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
+  ComlibArrayListener.h ComlibStats.h comlib.decl.h
+       $(CHARMC) -c -I. BroadcastStrategy.C
 
-BroadcastStrategy.o: BroadcastStrategy.C BroadcastStrategy.h \
+RectMulticastStrategy.o: RectMulticastStrategy.C RectMulticastStrategy.h \
   ComlibManager.h convcomlibmanager.h convcomlibstrategy.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  cklists.h ComlibStrategy.h charm++.h charm.h converse.h pup.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h \
+  debug-charm.h debug-conv.h simd.h CkMarshall.decl.h cksection.h \
+  ckcallback.h conv-ccs.h sockRoutines.h conv-config.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
+  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
+  ComlibArrayListener.h ComlibStats.h comlib.decl.h ComlibSectionInfo.h
+       $(CHARMC) -c -I. RectMulticastStrategy.C
+
+convcomlibstrategy.o: convcomlibstrategy.C convcomlibmanager.h \
+  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
   persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
   charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
@@ -2406,13 +2384,12 @@ BroadcastStrategy.o: BroadcastStrategy.C BroadcastStrategy.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
   conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
-  ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h
-       $(CHARMC) -c -I. BroadcastStrategy.C
+  ComlibLearner.h
+       $(CHARMC) -c -I. convcomlibstrategy.C
 
-RectMulticastStrategy.o: RectMulticastStrategy.C RectMulticastStrategy.h \
-  ComlibManager.h convcomlibmanager.h convcomlibstrategy.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
+ComlibManager.o: ComlibManager.C ComlibManager.h convcomlibmanager.h \
+  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
   persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
   charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
@@ -2428,49 +2405,7 @@ RectMulticastStrategy.o: RectMulticastStrategy.C RectMulticastStrategy.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
   conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
   ComlibLearner.h ComlibArrayListener.h ComlibStats.h comlib.decl.h \
-  ComlibSectionInfo.h
-       $(CHARMC) -c -I. RectMulticastStrategy.C
-
-convcomlibstrategy.o: convcomlibstrategy.C convcomlibmanager.h \
-  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  debug-conv.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h conv-config.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
-  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h
-       $(CHARMC) -c -I. convcomlibstrategy.C
-
-ComlibManager.o: ComlibManager.C ComlibManager.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  debug-conv.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h conv-config.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
-  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
-  ComlibArrayListener.h ComlibStats.h comlib.decl.h comlib.h \
-  StreamingStrategy.h MeshStreamingStrategy.h PrioStreaming.h \
+  comlib.h StreamingStrategy.h MeshStreamingStrategy.h PrioStreaming.h \
   BroadcastStrategy.h PipeBroadcastStrategy.h pipebroadcastconverse.h \
   OneTimeMulticastStrategy.h ComlibSectionInfo.h ChunkMulticastStrategy.h \
   EachToManyMulticastStrategy.h routerstrategy.h router.h \
@@ -2481,51 +2416,10 @@ ComlibManager.o: ComlibManager.C ComlibManager.h convcomlibmanager.h \
 
 ComlibStrategy.o: ComlibStrategy.C ComlibStrategy.h charm++.h charm.h \
   converse.h conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
-  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
-  register.h
-       $(CHARMC) -c -I. ComlibStrategy.C
-
-gridrouter.o: gridrouter.C gridrouter.h petable.h router.h cklists.h \
-  pup.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h \
-  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h middle.h middle-conv.h ckbitvector.h ckstream.h \
-  init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h convcomlibstrategy.h ComlibLearner.h
-       $(CHARMC) -c -I. gridrouter.C
-
-hypercuberouter.o: hypercuberouter.C hypercuberouter.h petable.h router.h \
-  cklists.h pup.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h middle.h middle-conv.h ckbitvector.h ckstream.h \
-  init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
   ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
   ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
@@ -2535,32 +2429,31 @@ hypercuberouter.o: hypercuberouter.C hypercuberouter.h petable.h router.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h convcomlibstrategy.h ComlibLearner.h
-       $(CHARMC) -c -I. hypercuberouter.C
+  envelope.h convcomlibstrategy.h ComlibLearner.h register.h
+       $(CHARMC) -c -I. ComlibStrategy.C
 
-treerouter.o: treerouter.C treerouter.h petable.h router.h cklists.h \
+gridrouter.o: gridrouter.C gridrouter.h petable.h router.h cklists.h \
   pup.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h \
-  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h middle.h middle-conv.h ckbitvector.h ckstream.h \
-  init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h convcomlibstrategy.h ComlibLearner.h
-       $(CHARMC) -c -I. treerouter.C
+  conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
+  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
+  debug-conv.h convcomlibmanager.h convcomlibstrategy.h converse.h pup.h \
+  cklists.h ComlibStrategy.h charm++.h charm.h middle.h middle-conv.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h
+       $(CHARMC) -c -I. gridrouter.C
 
-petable.o: petable.C petable.h router.h cklists.h pup.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
+hypercuberouter.o: hypercuberouter.C hypercuberouter.h petable.h router.h \
+  cklists.h pup.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
   persistent.h debug-conv.h convcomlibmanager.h convcomlibstrategy.h \
   converse.h pup.h cklists.h ComlibStrategy.h charm++.h charm.h middle.h \
@@ -2576,38 +2469,36 @@ petable.o: petable.C petable.h router.h cklists.h pup.h converse.h \
   ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
   trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
   ComlibLearner.h
-       $(CHARMC) -c -I. petable.C
-
-3dgridrouter.o: 3dgridrouter.C 3dgridrouter.h petable.h router.h \
-  cklists.h pup.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h middle.h middle-conv.h ckbitvector.h ckstream.h \
-  init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h convcomlibstrategy.h ComlibLearner.h
-       $(CHARMC) -c -I. 3dgridrouter.C
+       $(CHARMC) -c -I. hypercuberouter.C
 
-graphrouter.o: graphrouter.C graphrouter.h petable.h router.h cklists.h \
+treerouter.o: treerouter.C treerouter.h petable.h router.h cklists.h \
   pup.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
-  conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h \
-  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h middle.h middle-conv.h ckbitvector.h ckstream.h \
-  init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
+  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
+  debug-conv.h convcomlibmanager.h convcomlibstrategy.h converse.h pup.h \
+  cklists.h ComlibStrategy.h charm++.h charm.h middle.h middle-conv.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
+  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h
+       $(CHARMC) -c -I. treerouter.C
+
+petable.o: petable.C petable.h router.h cklists.h pup.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
+  convcomlibmanager.h convcomlibstrategy.h converse.h pup.h cklists.h \
+  ComlibStrategy.h charm++.h charm.h middle.h middle-conv.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
@@ -2615,13 +2506,12 @@ graphrouter.o: graphrouter.C graphrouter.h petable.h router.h cklists.h \
   CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
-  envelope.h convcomlibstrategy.h ComlibLearner.h hypercubetopology.h
-       $(CHARMC) -c -I. graphrouter.C
+  envelope.h convcomlibstrategy.h ComlibLearner.h
+       $(CHARMC) -c -I. petable.C
 
-hypercubetopology.o: hypercubetopology.C hypercubetopology.h \
-  graphrouter.h petable.h router.h cklists.h pup.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
+3dgridrouter.o: 3dgridrouter.C 3dgridrouter.h petable.h router.h \
+  cklists.h pup.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
   persistent.h debug-conv.h convcomlibmanager.h convcomlibstrategy.h \
   converse.h pup.h cklists.h ComlibStrategy.h charm++.h charm.h middle.h \
@@ -2637,62 +2527,38 @@ hypercubetopology.o: hypercubetopology.C hypercubetopology.h \
   ckcheckpoint.h CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h \
   trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
   ComlibLearner.h
-       $(CHARMC) -c -I. hypercubetopology.C
-
-routerstrategy.o: routerstrategy.C routerstrategy.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  debug-conv.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h conv-config.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
-  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
-  router.h gridrouter.h petable.h persistent.h graphrouter.h \
-  hypercuberouter.h treerouter.h 3dgridrouter.h prefixrouter.h converse.h
-       $(CHARMC) -c -I. routerstrategy.C
+       $(CHARMC) -c -I. 3dgridrouter.C
 
-convcomlibmanager.o: convcomlibmanager.C convcomlibmanager.h \
-  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h converse.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
-  debug-conv.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
-  conv-ccs.h sockRoutines.h conv-config.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
-  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
-  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
-  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
-  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
-  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
-  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
-  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
+graphrouter.o: graphrouter.C graphrouter.h petable.h router.h cklists.h \
+  pup.h converse.h conv-config.h conv-autoconfig.h conv-common.h \
+  conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h \
+  conv-qd.h conv-random.h conv-lists.h conv-trace.h persistent.h \
+  debug-conv.h convcomlibmanager.h convcomlibstrategy.h converse.h pup.h \
+  cklists.h ComlibStrategy.h charm++.h charm.h middle.h middle-conv.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
+  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
+  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
   trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h \
-  routerstrategy.h router.h StreamingStrategy.h MeshStreamingStrategy.h \
-  pipebroadcastconverse.h
-       $(CHARMC) -c -I. convcomlibmanager.C
+  hypercubetopology.h
+       $(CHARMC) -c -I. graphrouter.C
 
-pipebroadcastconverse.o: pipebroadcastconverse.C pipebroadcastconverse.h \
-  ckhashtable.h pup.h converse.h conv-config.h conv-autoconfig.h \
-  conv-common.h conv-mach.h conv-mach-opt.h conv-mach-pedantic.h pup_c.h \
-  queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
-  conv-trace.h persistent.h debug-conv.h convcomlibmanager.h \
-  convcomlibstrategy.h converse.h pup.h cklists.h ComlibStrategy.h \
-  charm++.h charm.h middle.h middle-conv.h cklists.h ckbitvector.h \
-  ckstream.h init.h debug-charm.h simd.h CkMarshall.decl.h cksection.h \
-  ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h ckobjQ.h \
-  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+hypercubetopology.o: hypercubetopology.C hypercubetopology.h \
+  graphrouter.h petable.h router.h cklists.h pup.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h \
+  convcomlibmanager.h convcomlibstrategy.h converse.h pup.h cklists.h \
+  ComlibStrategy.h charm++.h charm.h middle.h middle-conv.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
   CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
   readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
   LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
@@ -2701,18 +2567,14 @@ pipebroadcastconverse.o: pipebroadcastconverse.C pipebroadcastconverse.h \
   waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
   ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
   envelope.h convcomlibstrategy.h ComlibLearner.h
-       $(CHARMC) -c -I. pipebroadcastconverse.C
-
-pipelinestrategy.o: pipelinestrategy.C
-       $(CHARMC) -c -I. pipelinestrategy.C
+       $(CHARMC) -c -I. hypercubetopology.C
 
-prefixrouter.o: prefixrouter.C prefixrouter.h converse.h conv-config.h \
-  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h \
-  conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h converse.h \
+routerstrategy.o: routerstrategy.C routerstrategy.h convcomlibmanager.h \
+  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h router.h cklists.h pup.h converse.h \
-  convcomlibmanager.h convcomlibstrategy.h pup.h cklists.h \
-  ComlibStrategy.h charm++.h charm.h middle.h middle-conv.h ckbitvector.h \
+  persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
+  charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
   ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
   CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
   conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
@@ -2724,17 +2586,20 @@ prefixrouter.o: prefixrouter.C prefixrouter.h converse.h conv-config.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
   conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
-  ComlibLearner.h
-       $(CHARMC) -c -I. prefixrouter.C
+  ComlibLearner.h router.h gridrouter.h petable.h persistent.h \
+  graphrouter.h hypercuberouter.h treerouter.h 3dgridrouter.h \
+  prefixrouter.h converse.h
+       $(CHARMC) -c -I. routerstrategy.C
 
-controlPoints.o: controlPoints.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
+convcomlibmanager.o: convcomlibmanager.C convcomlibmanager.h \
+  convcomlibstrategy.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  persistent.h debug-conv.h pup.h cklists.h ComlibStrategy.h charm++.h \
+  charm.h converse.h pup.h middle.h middle-conv.h cklists.h ckbitvector.h \
+  ckstream.h init.h ckhashtable.h debug-charm.h debug-conv.h simd.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  conv-config.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
   lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
@@ -2742,21 +2607,19 @@ controlPoints.o: controlPoints.C charm++.h charm.h converse.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h controlPoints.h ControlPoints.decl.h \
-  charm++.h pup_stl.h LBDatabase.h arrayRedistributor.h pathHistory.h \
-  PathHistory.decl.h envelope.h cp_effects.h ck.h qd.h register.h stats.h \
-  ckfutures.h ckIgetControl.h ckarray.h trace-controlPoints.h trace.h \
-  register.h trace-common.h trace-projections.h ckhashtable.h pup.h \
-  pathHistory.h cp_effects.h ControlPoints.def.h
-       $(CHARMC) -c -I. controlPoints.C
+  conv-trace.h trace-bluegene.h envelope.h convcomlibstrategy.h \
+  ComlibLearner.h routerstrategy.h router.h StreamingStrategy.h \
+  MeshStreamingStrategy.h pipebroadcastconverse.h
+       $(CHARMC) -c -I. convcomlibmanager.C
 
-arrayRedistributor.o: arrayRedistributor.C charm++.h charm.h converse.h \
-  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
+pipebroadcastconverse.o: pipebroadcastconverse.C pipebroadcastconverse.h \
+  ckhashtable.h pup.h converse.h conv-config.h conv-autoconfig.h \
+  conv-common.h conv-mach.h conv-mach-opt.h pup_c.h queueing.h conv-cpm.h \
   conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
+  persistent.h debug-conv.h convcomlibmanager.h convcomlibstrategy.h \
+  converse.h pup.h cklists.h ComlibStrategy.h charm++.h charm.h middle.h \
+  middle-conv.h cklists.h ckbitvector.h ckstream.h init.h debug-charm.h \
+  simd.h CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h \
   sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
   cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
   CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
@@ -2765,29 +2628,93 @@ arrayRedistributor.o: arrayRedistributor.C charm++.h charm.h converse.h \
   CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
   tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
   CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h ControlPoints.decl.h charm++.h \
-  trace-controlPoints.h trace.h envelope.h register.h trace-common.h \
-  LBDatabase.h controlPoints.h pup_stl.h arrayRedistributor.h \
-  pathHistory.h PathHistory.decl.h cp_effects.h ck.h qd.h register.h \
-  stats.h ckfutures.h ckIgetControl.h ckarray.h
+  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h
+       $(CHARMC) -c -I. pipebroadcastconverse.C
+
+pipelinestrategy.o: pipelinestrategy.C
+       $(CHARMC) -c -I. pipelinestrategy.C
+
+prefixrouter.o: prefixrouter.C prefixrouter.h converse.h conv-config.h \
+  conv-autoconfig.h conv-common.h conv-mach.h conv-mach-opt.h pup_c.h \
+  queueing.h conv-cpm.h converse.h conv-cpath.h conv-qd.h conv-random.h \
+  conv-lists.h conv-trace.h persistent.h debug-conv.h router.h cklists.h \
+  pup.h converse.h convcomlibmanager.h convcomlibstrategy.h pup.h \
+  cklists.h ComlibStrategy.h charm++.h charm.h middle.h middle-conv.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  debug-conv.h simd.h CkMarshall.decl.h cksection.h ckcallback.h \
+  conv-ccs.h sockRoutines.h conv-config.h ccs-server.h ckobjQ.h \
+  ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h conv-trace.h \
+  trace-bluegene.h envelope.h convcomlibstrategy.h ComlibLearner.h
+       $(CHARMC) -c -I. prefixrouter.C
+
+controlPoints.o: controlPoints.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h charm++.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h controlPoints.h ControlPoints.decl.h charm++.h pup_stl.h \
+  LBDatabase.h arrayRedistributor.h pathHistory.h PathHistory.decl.h \
+  envelope.h cp_effects.h ck.h qd.h register.h stats.h ckfutures.h \
+  ckIgetControl.h ckarray.h trace-controlPoints.h trace.h register.h \
+  trace-common.h trace-projections.h ckhashtable.h pup.h pathHistory.h \
+  cp_effects.h ControlPoints.def.h
+       $(CHARMC) -c -I. controlPoints.C
+
+arrayRedistributor.o: arrayRedistributor.C charm++.h charm.h converse.h \
+  conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h charm++.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h ControlPoints.decl.h charm++.h trace-controlPoints.h trace.h \
+  envelope.h register.h trace-common.h LBDatabase.h controlPoints.h \
+  pup_stl.h arrayRedistributor.h pathHistory.h PathHistory.decl.h \
+  cp_effects.h ck.h qd.h register.h stats.h ckfutures.h ckIgetControl.h \
+  ckarray.h
        $(CHARMC) -c -I. arrayRedistributor.C
 
 cp_effects.o: cp_effects.C cp_effects.h charm++.h charm.h converse.h \
   conv-config.h conv-autoconfig.h conv-common.h conv-mach.h \
-  conv-mach-opt.h conv-mach-pedantic.h pup_c.h queueing.h conv-cpm.h \
-  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
-  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
-  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h simd.h \
-  CkMarshall.decl.h charm++.h cksection.h ckcallback.h conv-ccs.h \
-  sockRoutines.h ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
-  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
-  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
-  lbdb.h LBDBManager.h LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h \
-  LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
-  CkArray.decl.h CkFutures.decl.h charisma.h charisma.decl.h tempo.h \
-  tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
-  CkCheckpoint.decl.h ckevacuation.h ckarrayreductionmgr.h trace.h \
-  trace-bluegene.h envelope.h ck.h qd.h register.h stats.h ckfutures.h \
-  ckIgetControl.h ckarray.h
+  conv-mach-opt.h pup_c.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h \
+  conv-random.h conv-lists.h conv-trace.h persistent.h debug-conv.h pup.h \
+  middle.h middle-conv.h cklists.h ckbitvector.h ckstream.h init.h \
+  ckhashtable.h debug-charm.h simd.h CkMarshall.decl.h charm++.h \
+  cksection.h ckcallback.h conv-ccs.h sockRoutines.h ccs-server.h \
+  ckobjQ.h ckreduction.h CkReduction.decl.h cknodegroupreduction.h \
+  CkArrayReductionMgr.decl.h ckmemcheckpoint.h CkMemCheckpoint.decl.h \
+  readonly.h ckarray.h cklocation.h LBDatabase.h lbdb.h LBDBManager.h \
+  LBObj.h LBOM.h LBComm.h LBMachineUtil.h lbdb++.h LBDatabase.decl.h \
+  NullLB.decl.h BaseLB.decl.h CkLocation.decl.h CkArray.decl.h \
+  CkFutures.decl.h charisma.h charisma.decl.h tempo.h tempo.decl.h \
+  waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h CkCheckpoint.decl.h \
+  ckevacuation.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h ck.h qd.h register.h stats.h ckfutures.h ckIgetControl.h \
+  ckarray.h
        $(CHARMC) -c -I. cp_effects.C
 
index bf3cf1332c371a9bee44ed3d59e034a102de5948..c777e4c24e34a48afd11b68daf40329f3c39ff61 100644 (file)
@@ -245,7 +245,7 @@ CKHEADERS=ck.h ckstream.h envelope.h init.h qd.h charm.h charm++.h \
 
 ALLHEADERS=$(CKHEADERS) \
     simplemsg.h sm.h pvmc.h pvm3.h sdag.h \
-       graph.h bitvecset.h Set.h LBSimulation.h  \
+       graph.h bitvecset.h ckset.h LBSimulation.h  \
        $(BLUE_HEADERS)
 
 basics: headers
@@ -643,7 +643,7 @@ LIBCK_CORE=trace-common.o tracef.o init.o register.o qd.o ck.o main.o  \
            LBDBManager.o LBComm.o LBObj.o LBMachineUtil.o CentralPredictor.o \
           BaseLB.o CentralLB.o HybridBaseLB.o NborBaseLB.o WSLB.o \
            ObjGraph.o graph.o LButil.o Refiner.o RefinerApprox.o  \
-           RefinerComm.o bitvecset.o Set.o ckheap.o CommLBHeap.o \
+           RefinerComm.o bitvecset.o ckset.o ckheap.o CommLBHeap.o \
           NullLB.o LBSimulation.o $(COMLIB_CORE_OBJS) \
           charmProjections.o pathHistory.o