Fix up primary keys for a few tables, for efficiency, and so that

REPLACE statements will work correctly.

Also, remove the few INSERT statements, which will shortly be in
a new file.