Minor changes for new indexing engine. This commit makes some minor preparations in various files to prepare for the new indexer support. This commit holds most of the differences to existing files.