Side note: if you're in the middle of fixing one canonical order & you see another that needs fixing, write the new one down on your Fun List & get back to what you were doing. Multiple simple, safe passes are better than one pass that gets more & more complicated until you lose safety.