Rewrite the index generation support -- this seems to do the right thing,
and doesn't break the build in the non-GEN_INDEX case, so it's safe to
commit. I need more people testing it though.