Moved the recording of external entity ids to a field-identifier indexed
array.