Improve our sync progress report, and fix unit tests to match.

There are also some PEP-8 improvements in this commit.