Logged In: YES 
user_id=6380

You know, I can't figure out why the code in wrap_index()
has the desired effect, but it does...  Somehow it looks
suspiciously, as if it could sometimes return a non-integral
self, but I can't come up with a test case where that
happens, so I think it's okay.

I think this is good to go now; I'll sleep on it for a night
and then check it in.

Thanks for all your efforts, Travis!