Update tlds

See second changeset for diff.

The old format made it too hard to see changes, and the code is simpler now.