refactor(cli): simplify indexing safety changes