More work on code indexing