wow ! Cluade (4.1) performed this refactoring - the first decent sized thing it has done successfully