Factor out the 'key fields without link_id' logic from document
Also make sure the to-be-removed is present before removing it when
doing the field reordening.
Patch by: Sverre Rabbelier
README.txt
coverage.py
setup.py
coverage.egg-info/SOURCES.txt
coverage.egg-info/dependency_links.txt
coverage.egg-info/entry_points.txt
coverage.egg-info/top_level.txt