It's 5 lines only, and moreover, most of the extra complexities come from backward compatibilities during the transition period and will be removed after the transition anyway. So my conclusion is it's not worth doing any refactoring, but if you do feel the necessity, you are welcome to create your own patch on top. Thanks.