Drop last remaining use of Index/Indexer (closes #443)