It's much simpler in any case. I'm going to hold off on doing that change for this CL, but it sounds like a nice cleanup for another iteration.