A couple of tweaks trying to determine why the index doesn't
build correctly.