CR changes

Use createIndexOnEmptyCollection instead of MultiIndexBlock.
Also, some minor changes / renaming.