More work on the 'new' indexer, including bug fixes and performance
improvements