Sync options 1145

This finished both on my Mac and on demo-k (full TSTFF synch of 70K files) in a reasonable amount of time.