Yesterday's one line fix did, in fact, work. While testing that I decided on another half dozen or so small changes to work on next. I can probably slam all those out before end of day tomorrow.