Fix passing of options/pointer during indexing.