Well, that is some rather extensive refactoring of the code, but I've reviewed it and it all makes sense in context (though I think the goal could have been accomplished without the refactoring).
Well, that is some rather extensive refactoring of the code, but I've reviewed it and it all makes sense in context (though I think the goal could have been accomplished without the refactoring).