replacing func() with xfunc() where appropriate

6 files changed