Have reached the stage of going sentence-by-sentence, changing many three times before deciding to leave them as they originally stood and muttering curses at Past Me for the sheer number of notes in brackets I left for the revision pass.
In other words, progress, but argh.