Just committed what I think you're talking about. You're right, it's much nicer that way.

As far as the ugly indexing, I'm not sure of a nicer way to do it, but I'd love to be proven wrong.