Use newer indexing scheme.