NFS: Get rid of some obsolete macros