That said, in this case it might be simplest to just merge and revisit the idea of well factored code another time.