This is just laying some groundwork for internal index changes
that I'm working on.