Yet more indexing; I think we have it right this time... (he said humorously...)