Following up on Tom's suggestion I am checking in a patch to replace the various