I would prefer that, thank you.  We win by frequent refactoring, and refactoring is cheapest when we minimize the number of moving parts. :)