minor cleanups to FWorker