The memory overhead is pretty negligible, and it would make the code much easier to read. I had some trouble parsing this block of changes due to that.