I squashed the changes I suggested in previous emails, Ashwin's patch, my suggested updates to that patch, and the index order check all into one updated patch attached.
I realized that the numbers at the front probably indicate which patch it is in a patch set and not the version, so, if that is the case, a renamed patch -- second version but the only patch needed if you are applying to master.
