Yes, I understand, but let's clean this up separately. Right now we are about to make a release, so we are only merging immediate critical bug fixes. I understand it's cleaner to have it the other way, but verifying the correctness of the refactoring will require running a bunch of test builds on our end, and we want to avoid that.