Fixed the wildcard imports. What a pox on the land those are.
Unwinding some of the IndexedSet stuff because the profiler points to it as a source of problems.