Holy refactoring, batman!  Seriously - had the bite the bullet and just DO IT.
Well, nuts - didn't want DEADJOE