JUnit updates and the rest of the subsumption code.  Also some indexing
for optimizing the load.