The following changes rework my patch of 2002-02-06 which