Created by: eseliger
This does a lot of changes that I found on the way to making the syncer use a deterministic token. It should be reviewed commit by commit.