Thanks for your suggestions. At this point option (1) is looking most attractive. Probably, I will just withdraw the CF entry soon unless there is some new interest. Just chipping away fixing a few places isn't going to achieve the consistency this thread was aiming for.
I've moved this back to waiting on author pending a final decision. Interested parties might still chime in but it doesn't seem like it is actively looking for reviewers at this point.
