This is a classic "we should refactor" without understanding the original architecture/decision making. No doubt some of the issues you describe become apparen

This is a classic "we should refactor" without understanding the original architecture/decision making. No doubt some of the issues you describe become apparent when you actually attempt the task, yet it's easy to propose a reasonable alternative. Anyway, I love that we both have a rebuttal to the original as well as a firm defense from the OP.