Gather index info at the same time as table info, rather than later.

This helps avoid possible problems with later strong table locks.