Correcting field index keys.

Gah.  One more edit.  This should be it.