cleanup and fixes for Index::resetDefault()