This is a necessary refactoring step.
Created attachment 10860 [details] patch
Comment on attachment 10860 [details] patch This was reviewed and landed.