fix a couple of cores.
reduce memory usage significantly by not
pre-allocating some per-collection hashtables.