Here are updated versions of these patches.  Please disregard the
earlier ones.

     Mark