Clean up sync cruft. Add sanity break in pagination loop.