Well, the changes here are pretty pervasive and error prone already. If it was changed to just being pervasive, that's still a win. Anyway, it's better to talk code. I will try to code my idea, see how it looks, and if it ain't half bad I'll give you a PR against this and we can talk.