Removed some of the dependence on TVFS.