More cleanup after initial indexing impl.