It may be time to bite the bullet and adopt more of that code to break the dep and control bugfix cycles