- adjust to newest xotcl 2/nsf from git