Moved all the defvars to the front, renamed key-field-index to have a double -- so it indicates private use.