Replaces !67 (closed). Some obsolete files are not recorded. Another set of changes should remove them.