Bring up to date with xfns.c changes from 2000-02-25 and 2000-02-21.