Maybe it would. I'm in the mode of "make it right" now. Perhaps in another PR, I can do some optimizations. This code path is now critical.