True, I realized the code duplication and felt the need to have the code be restricted within QueryPlan and have started working on the change. Will submit that in the next patch.