Filter out stale search results, plus some minor refactoring.
Cleanup
Five more CollectionIT tests working.