That is a good plan, its not part of my patch though, I just moved it around. Maybe address as a separate commit?