This is a revamp of the previous milestone.

This includes other bugs not directly related to per-file syncing that are being fixed because they eventually affect the main bug.