Thanks for the review.  I'll fold in the attached further patch before 
installing.  As you may be able to tell, I don't use the manual indexes and so 
my indexing can be a bit random.