OK cool. In that case, I'll leave the bug fix as is and make that the first patch. The goal of the first patch is simply to ensure that if you download from a VX-8R, you don't generate trace back errors and you don't get a Settings menu at all. In other words, ensure that the correct code gets called for a given variant.
Yeah, good plan.
On an administrative note, should we just reject Issue 4881 and have me create a new issue with the scope of work limited to the bug fix?
It's up to you, but I don't think you need to close it. You could call all of your patches "groundwork" for getting to 4881, or open a new bug for the correctness (i.e. fixing the tracebacks) and then any refactors are mostly groundwork for the end goal of settings support for the base driver.
But, your call as you're doing the work. I just granted you permissions to monkey with the issues, so you can close/create/link as you see fit.
Thanks!
--Dan